Merge pull request #861 from QualiSystems/develop

Merge dev to master for 1.6.1 release
QualiSystems · Apr 6, 2017 · b14df45 · b14df45
2 parents b0b39fd + f895716
commit b14df45
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
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.6.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.6.1">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

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

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

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

diff --git a/package/cloudshell/cp/vcenter/vm/portgroup_configurer.py b/package/cloudshell/cp/vcenter/vm/portgroup_configurer.py
@@ -65,7 +65,11 @@ def erase_network_by_mapping(self, networks, reserved_networks, logger):
             for net in networks:
                 try:
                     nets[net.name] = net
-                    for network in nets.values():
+                except:
+                    continue
+
+                for network in nets.values():
+                    try:
                         if self.network_name_gen.is_generated_name(network.name) \
                                 and (not reserved_networks or network.name not in reserved_networks) \
                                 and not network.vm:
@@ -75,10 +79,8 @@ def erase_network_by_mapping(self, networks, reserved_networks, logger):
                                     self.synchronous_task_waiter.wait_for_task(task=task,
                                                                                logger=logger,
                                                                                action_name='Erase dv Port Group')
-                except Exception as e:
-                    logger.debug("Failed to erase network", exc_info=True)
-                    a = e.msg
-                    continue
+                    except Exception as e:
+                        continue
         finally:
             self._lock.release()
 

diff --git a/package/version.txt b/package/version.txt
@@ -1 +1 @@
-1.6.0
+1.6.1
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.6.0">
+<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.6.1">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From Template" EnableCancellation="true" Name="deploy_from_template" Tags="allow_unreserved" />

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.6.0
+1.6.1