1
0
mirror of https://github.com/vmware/vsphere-automation-sdk-python.git synced 2024-11-24 18:30:00 -05:00

Merge pull request #15 from kmruddy/master

Update configuration inputs
This commit is contained in:
Tianhao He 2017-04-03 12:56:38 -07:00 committed by GitHub
commit 61bd21f9ce
4 changed files with 8 additions and 12 deletions

View File

@ -42,7 +42,6 @@ Sample Prerequisites:
- datacenter - datacenter
- vm folder - vm folder
- datastore - datastore
- cluster
- standard switch network - standard switch network
""" """
@ -70,9 +69,9 @@ def setup(context=None):
def run(): def run():
# Get a placement spec # Get a placement spec
datacenter_name = testbed.config['DATACENTER2_NAME'] datacenter_name = testbed.config['VM_DATACENTER_NAME']
vm_folder_name = testbed.config['VM_FOLDER2_NAME'] vm_folder_name = testbed.config['VM_FOLDER2_NAME']
datastore_name = testbed.config['NFS_DATASTORE_NAME'] datastore_name = testbed.config['VM_DATASTORE_NAME']
std_portgroup_name = testbed.config['STDPORTGROUP_NAME'] std_portgroup_name = testbed.config['STDPORTGROUP_NAME']
placement_spec = vm_placement_helper.get_placement_spec_for_resource_pool( placement_spec = vm_placement_helper.get_placement_spec_for_resource_pool(
stub_config, stub_config,

View File

@ -36,8 +36,6 @@ Sample Prerequisites:
- datacenter - datacenter
- vm folder - vm folder
- datastore - datastore
- cluster
- standard switch network
""" """
stub_config = None stub_config = None
@ -64,9 +62,9 @@ def setup(context=None):
def run(): def run():
# Get a placement spec # Get a placement spec
datacenter_name = testbed.config['DATACENTER2_NAME'] datacenter_name = testbed.config['VM_DATACENTER_NAME']
vm_folder_name = testbed.config['VM_FOLDER2_NAME'] vm_folder_name = testbed.config['VM_FOLDER2_NAME']
datastore_name = testbed.config['NFS_DATASTORE_NAME'] datastore_name = testbed.config['VM_DATASTORE_NAME']
placement_spec = vm_placement_helper.get_placement_spec_for_resource_pool( placement_spec = vm_placement_helper.get_placement_spec_for_resource_pool(
stub_config, stub_config,
datacenter_name, datacenter_name,

View File

@ -44,7 +44,6 @@ Sample Prerequisites:
- vm folder - vm folder
- resource pool - resource pool
- datastore - datastore
- cluster
- standard switch network - standard switch network
- distributed switch network - distributed switch network
- An iso file on the datastore mentioned above - An iso file on the datastore mentioned above
@ -74,9 +73,9 @@ def setup(context=None):
def run(): def run():
# Get a placement spec # Get a placement spec
datacenter_name = testbed.config['DATACENTER2_NAME'] datacenter_name = testbed.config['VM_DATACENTER_NAME']
vm_folder_name = testbed.config['VM_FOLDER2_NAME'] vm_folder_name = testbed.config['VM_FOLDER2_NAME']
datastore_name = testbed.config['NFS_DATASTORE_NAME'] datastore_name = testbed.config['VM_DATASTORE_NAME']
std_portgroup_name = testbed.config['STDPORTGROUP_NAME'] std_portgroup_name = testbed.config['STDPORTGROUP_NAME']
dv_portgroup_name = testbed.config['VDPORTGROUP1_NAME'] dv_portgroup_name = testbed.config['VDPORTGROUP1_NAME']
placement_spec = vm_placement_helper.get_placement_spec_for_resource_pool( placement_spec = vm_placement_helper.get_placement_spec_for_resource_pool(

View File

@ -95,8 +95,8 @@ def setup(context=None):
# Get the datacenter and datastore managed objects to be able to create and # Get the datacenter and datastore managed objects to be able to create and
# delete VMDKs, which are backings for a VM Disk. # delete VMDKs, which are backings for a VM Disk.
datacenter_name = testbed.config['DATACENTER2_NAME'] datacenter_name = testbed.config['VM_DATACENTER_NAME']
datastore_name = testbed.config['NFS_DATASTORE_NAME'] datastore_name = testbed.config['VM_DATASTORE_NAME']
datastore_mo = get_datastore_mo(stub_config, datastore_mo = get_datastore_mo(stub_config,
service_instance._stub, service_instance._stub,
datacenter_name, datacenter_name,