Merge pull request #865 from QualiSystems/develop

merging dev to master for 1.7.0 release

Author: alexazarh

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.6.1">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.7.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_clone_from_vm/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=8.0.0.0,<8.1.0.0
-cloudshell-cp-vcenter>=1.6.0,<1.7.0
+cloudshell-cp-vcenter>=1.7.0,<1.8.0
 cloudshell-shell-core>=2.0.0,<2.1.0

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.6.1">
+<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.7.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_image/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=8.0.0.0,<8.1.0.0
-cloudshell-cp-vcenter>=1.6.0,<1.7.0
+cloudshell-cp-vcenter>=1.7.0,<1.8.0
 cloudshell-shell-core>=2.0.0,<2.1.0

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.6.1">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.7.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_linked_clone/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=8.0.0.0,<8.1.0.0
-cloudshell-cp-vcenter>=1.6.0,<1.7.0
+cloudshell-cp-vcenter>=1.7.0,<1.8.0
 cloudshell-shell-core>=2.0.0,<2.1.0

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.6.1">
+<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.7.0">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_template/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=8.0.0.0,<8.1.0.0
-cloudshell-cp-vcenter>=1.6.0,<1.7.0
+cloudshell-cp-vcenter>=1.7.0,<1.8.0
 cloudshell-shell-core>=2.0.0,<2.1.0

external_requirements.txt

@@ -1,3 +1,3 @@
-pyvmomi==6.0.0
+pyvmomi==6.5.0
 jsonpickle==0.9.3
 enum==0.4.6

package/cloudshell/tests/test_network/test_dvswitch/test_port_group_configurer.py

@@ -1,7 +1,8 @@
 from unittest import TestCase
 
+from cloudshell.cp.vcenter.network.dvswitch.name_generator import DvPortGroupNameGenerator
 from cloudshell.cp.vcenter.vm.portgroup_configurer import VirtualMachinePortGroupConfigurer
-from mock import Mock
+from mock import Mock, MagicMock
 from pyVmomi import vim
 
 from cloudshell.cp.vcenter.vm.dvswitch_connector import ConnectRequest
@@ -27,6 +28,13 @@ def setUp(self):
         self.network.config.distributedVirtualSwitch.uuid = "422254d5-5226-946e-26fb-60c21898b73f"
         self.py_vmomi_service = Mock()
 
+        self.network2 = Mock()
+        self.network2.key = "network2-key"
+        self.network2.name = "QS_network2"
+        self.network3 = Mock()
+        self.network3.key = "network3-key"
+        self.network3.name = "QS_network3"
+
         self.vm = Mock()
         self.vm.config.hardware = Mock()
         self.vnic = Mock(spec=vim.vm.device.VirtualEthernetCard)
@@ -46,12 +54,14 @@ def setUp(self):
         self.vnic_to_network_mapper.map_request_to_vnics = Mock(return_value=mapping)
         self.vnics = {'vnic 1': self.vnic}
 
+        self.port_group_name_generator = DvPortGroupNameGenerator()
+
         self.vnic_service.map_vnics = Mock(return_value=self.vnics)
         self.configurer = VirtualMachinePortGroupConfigurer(self.py_vmomi_service,
                                                             self.synchronous_task_waiter,
                                                             self.vnic_to_network_mapper,
                                                             self.vnic_service,
-                                                            Mock())
+                                                            self.port_group_name_generator)
 
     def test_get_networks_on_vnics(self):
         res = self.configurer.get_networks_on_vnics(self.vm, [self.vnic], logger=Mock())
@@ -73,3 +83,28 @@ def test_connect_vnic_to_networks(self):
         mapping = [ConnectRequest('vnic 1', (Mock(spec=vim.Network), None))]
         res = self.configurer.connect_vnic_to_networks(self.vm, mapping, Mock(spec=vim.Network), [], logger=Mock())
         self.assertIsNotNone(res[0].vnic)
+
+    def test_disconnect_network_that_two_vms_have(self):
+        def side_effect(*args, **keys):
+            del self.network.name
+
+        self.network.vm = None
+        self.port_group_name_generator.is_generated_name = MagicMock(return_value=True)
+        self.configurer.destroy_port_group_task = MagicMock(side_effect=side_effect)
+        self.configurer.erase_network_by_mapping([self.network, self.network], [], logger=Mock())
+
+    def test_disconnect_vm_with_three_networks(self):
+        def side_effect(*args, **keys):
+            del args[0].name
+
+        self.network.vm = None
+        self.network2.vm = None
+        self.network3.vm = None
+        self.port_group_name_generator.is_generated_name = MagicMock(return_value=True)
+        self.configurer.destroy_port_group_task = MagicMock(side_effect=side_effect)
+        self.configurer.erase_network_by_mapping([self.network, self.network2, self.network3], [], logger=Mock())
+
+        # Assert
+        self.assertFalse(hasattr(self.network, 'name'))
+        self.assertFalse(hasattr(self.network2, 'name'))
+        self.assertFalse(hasattr(self.network3, 'name'))