fixed a bug that occured when dvswitch is directly under the datacenter.

Author: noamwegner

.gitignore

@@ -81,3 +81,5 @@ develop.cmd
 *.zip
 debug.xml
 debug_info.txt
+/package/package
+/package/version.txt

kill_python.bat

@@ -0,0 +1,4 @@
+@echo off
+::taskkill /im python.exe /f
+wmic Path win32_process Where "CommandLine Like '%%\\ExecutionServer\\%%python.exe%%'" Call Terminate
+wmic Path win32_process Where "CommandLine Like '%%\\ProgramData\\QualiSystems\\%%python.exe%%'" Call Terminate

package/cloudshell/cp/vcenter/common/vcenter/model_auto_discovery.py

@@ -116,13 +116,8 @@ def _validate_datacenter(self, si, all_item_in_vc, auto_att, attributes):
     def _validate_default_dvswitch(self, si, all_items_in_vc, auto_att, dc_name, attributes, key):
 
         dvs_path = attributes[key]
-
-        path, name = get_path_and_name(dvs_path)
-        path = "{}/{}".format(dc_name, path)
-        dv = self.pv_service.find_dvs_by_name(si, path, name)
-
-        if not dv:
-            raise ValueError('Could not find Default DvSwitch {0} in path {1}'.format(name, path))
+        path = "{}/{}".format(dc_name, dvs_path)
+        dv = self.pv_service.find_dvs_by_path(si, path)
 
         auto_att.append(AutoLoadAttribute('', DEFAULT_DVSWITCH, dvs_path))
 

package/cloudshell/cp/vcenter/common/vcenter/vmomi_service.py

@@ -222,16 +222,18 @@ def find_obj_by_path(self, si, path, name, type_name):
         '#searches for the specific vm in the folder'
         return search_index.FindChild(look_in, name)
 
-    def find_dvs_by_name(self,si ,path, name):
+    def find_dvs_by_path(self,si ,path):
         """
         Finds vm in the vCenter or returns "None"
-
         :param si:         pyvmomi 'ServiceInstance'
         :param path:       the path to find the object ('dc' or 'dc/folder' or 'dc/folder/folder/etc...')
-        :param name:       the dvSwitch name to return
         """
+        dvs = self.get_folder(si, path)
 
-        dvs = self.find_obj_by_path(si, path, name, '') # empty type_name, will resolve with ChildEntity
+        if not dvs:
+            raise ValueError('Could not find Default DvSwitch in path {0}'.format(path))
+        elif not isinstance(dvs, vim.dvs.VmwareDistributedVirtualSwitch):
+            raise ValueError('The object in path {0} is {1} and not a DvSwitch'.format(path, type(dvs)))
 
         return dvs
 

package/version.txt

@@ -1 +1 @@
-1.9.0
+1.9.0.99

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.9.0">
+<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.9.0.99">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From Template" EnableCancellation="true" Name="deploy_from_template" Tags="allow_unreserved" />

version.txt

@@ -1 +1 @@
-1.9.0
+1.9.0.99