From db807fab2daa4053255bc43e502adc7da5820b9d Mon Sep 17 00:00:00 2001 From: "Ashby, Jason (IMS)" Date: Fri, 12 Feb 2016 09:12:11 -0500 Subject: [PATCH] fix issue where datastore not being respected --- ezmomi/ezmomi.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/ezmomi/ezmomi.py b/ezmomi/ezmomi.py index c3bf537..5889883 100644 --- a/ezmomi/ezmomi.py +++ b/ezmomi/ezmomi.py @@ -228,7 +228,7 @@ def clone(self): resource_pool = cluster.resourcePool datastore = None - if datastore in ip_settings[0]: + if 'datastore' in ip_settings[0]: datastore = self.get_obj( [vim.Datastore], ip_settings[0]['datastore']) @@ -587,13 +587,13 @@ def get_resource_pool(self, cluster, pool_name): return pool_obj def get_obj(self, vimtype, name, return_all=False): - """Get the vsphere object associated with a given text name""" + """Get the vsphere object associated with a given text name or MOID""" obj = list() container = self.content.viewManager.CreateContainerView( self.content.rootFolder, vimtype, True) for c in container.view: - if c.name == name: + if name in [c.name, c._GetMoId()]: if return_all is False: return c break @@ -606,17 +606,6 @@ def get_obj(self, vimtype, name, return_all=False): # for backwards-compat return None - def get_obj_by_moid(self, vimtype, moid): - """Get the vsphere object associated with a given MoId""" - obj = None - container = self.content.viewManager.CreateContainerView( - self.content.rootFolder, vimtype, True) - for c in container.view: - if c._GetMoId() == moid: - obj = c - break - return obj - def get_host_system(self, name): return self.get_obj([vim.HostSystem], name)