merge from develop

borismod · borismod · commit 4eebdfcb4a4a · 2016-07-28T18:39:44.000+03:00
diff --git a/README.md b/README.md
@@ -12,6 +12,10 @@ A repository for projects providing out of the box capabilities within CloudShel
     App deployment type driver for deploying from vCenter OVF images
     * **deploy_from_template**
     App deployment type driver for cloning from vCenter templates
+    * **deploy_clone_vm_from_vm**
+    App deployment type driver for creating clones from existing VMs
+    * **deploy_vm_from_linked_clone**
+    App deployment type driver for deploying a linked clone (deploy from snapshot)
 
 
 * **package**
diff --git a/deployment_drivers/deploy_clone_from_vm/drivermetadata.xml b/deployment_drivers/deploy_clone_from_vm/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.2.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />
diff --git a/deployment_drivers/deploy_clone_from_vm/requirements.txt b/deployment_drivers/deploy_clone_from_vm/requirements.txt
@@ -1,4 +1,4 @@
 jsonpickle
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0
diff --git a/deployment_drivers/deploy_from_image/drivermetadata.xml b/deployment_drivers/deploy_from_image/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.2.0">
+<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />
diff --git a/deployment_drivers/deploy_from_image/requirements.txt b/deployment_drivers/deploy_from_image/requirements.txt
@@ -1,4 +1,4 @@
 jsonpickle
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0
diff --git a/deployment_drivers/deploy_from_linked_clone/drivermetadata.xml b/deployment_drivers/deploy_from_linked_clone/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.2.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />
diff --git a/deployment_drivers/deploy_from_linked_clone/requirements.txt b/deployment_drivers/deploy_from_linked_clone/requirements.txt
@@ -1,4 +1,4 @@
 jsonpickle
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0
diff --git a/deployment_drivers/deploy_from_template/drivermetadata.xml b/deployment_drivers/deploy_from_template/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.2.0">
+<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.3.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />
diff --git a/deployment_drivers/deploy_from_template/requirements.txt b/deployment_drivers/deploy_from_template/requirements.txt
@@ -1,4 +1,4 @@
 jsonpickle
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
 cloudshell-shell-core>=2.0.0,<2.1.0
diff --git a/package/version.txt b/package/version.txt
@@ -1 +1 @@
-1.2.0
+1.3.0
diff --git a/vCenterShellPackage/DataModel/DeploymentTypes-vCenterImage.png b/vCenterShellPackage/DataModel/DeploymentTypes-vCenterImage.png
diff --git a/vCenterShellPackage/DataModel/datamodel.xml b/vCenterShellPackage/DataModel/datamodel.xml
@@ -480,7 +480,7 @@
           <ns0:Scripts>
           </ns0:Scripts>
         </ns0:ResourceModel>
-        <ns0:ResourceModel Description="Deploy VM from Image with ovftool" Name="vCenter VM From Image" SupportsConcurrentCommands="false">
+        <ns0:ResourceModel Description="Deploy VM from Image with ovftool" ImagePath="DeploymentTypes-vCenterImage.png" Name="vCenter VM From Image" SupportsConcurrentCommands="false">
           <ns0:AttachedAttributes>
             <ns0:AttachedAttribute IsLocal="true" IsOverridable="true" Name="Default Datacenter">
               <ns0:AllowedValues />
diff --git a/vcentershell_driver/drivermetadata.xml b/vcentershell_driver/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.3.9999">
+<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.3.0">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From Template" Name="deploy_from_template" Tags="allow_unreserved" />
diff --git a/vcentershell_driver/requirements.txt b/vcentershell_driver/requirements.txt
@@ -1,2 +1,2 @@
 cloudshell-shell-core>=2.0.0,<2.1.0
-cloudshell-cp-vcenter>=1.2.0,<1.3.0
+cloudshell-cp-vcenter>=1.3.0,<1.4.0
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.2.0
+1.3.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.2.0">`
	`1`	`+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.3.0">`
`2`	`2`	`<Layout>`
`3`	`3`	`<Category Name="App Management">`
`4`	`4`	`<Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.2.0">`
	`1`	`+<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.3.0">`
`2`	`2`	`<Layout>`
`3`	`3`	`<Category Name="App Management">`
`4`	`4`	`<Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.2.0">`
	`1`	`+<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.3.0">`
`2`	`2`	`<Layout>`
`3`	`3`	`<Category Name="App Management">`
`4`	`4`	`<Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />`