Skip to content

Commit f974386

Browse files
committed
set wait_for_ip param to True
1 parent a3e2e6d commit f974386

2 files changed

Lines changed: 9 additions & 8 deletions

File tree

package/cloudshell/cp/vcenter/vm/vm_details_provider.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ def create(self, vm, name, reserved_networks, ip_regex, deployment_details_provi
2727
logger.info('waiting for ip = {0}'.format(wait_for_ip))
2828

2929
vm_instance_data = self._get_vm_instance_data(vm, deployment_details_provider)
30+
vm_network_data = self._get_vm_network_data(vm, reserved_networks, ip_regex, wait_for_ip, logger)
3031

31-
if wait_for_ip == 'True':
32-
vm_network_data = self._get_vm_network_data(vm, reserved_networks, ip_regex, logger)
33-
return VmDetailsData(vmInstanceData=vm_instance_data, vmNetworkData=vm_network_data)
34-
else:
35-
return VmDetailsData(vmInstanceData=vm_instance_data, vmNetworkData=None)
32+
return VmDetailsData(vmInstanceData=vm_instance_data, vmNetworkData=vm_network_data)
3633

3734
def _get_vm_instance_data(self, vm, deployment_details_provider):
3835
data = []
@@ -54,10 +51,14 @@ def _get_vm_instance_data(self, vm, deployment_details_provider):
5451

5552
return data
5653

57-
def _get_vm_network_data(self, vm, reserved_networks, ip_regex, logger):
54+
def _get_vm_network_data(self, vm, reserved_networks, ip_regex, wait_for_ip, logger):
5855
network_interfaces = []
5956

60-
primary_ip = self._get_primary_ip(vm, ip_regex, logger)
57+
if wait_for_ip == 'True':
58+
primary_ip = self._get_primary_ip(vm, ip_regex, logger)
59+
else:
60+
primary_ip = None;
61+
6162
net_devices = [d for d in vm.config.hardware.device if isinstance(d, vim.vm.device.VirtualEthernetCard)]
6263

6364
for device in net_devices:

package/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.14.9.4
1+
1.14.2

0 commit comments

Comments
 (0)