saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename test_map_conf test file to respect naming convention

Browse source
This commit is contained in:
Erik Johnson 2018-08-10 07:45:25 -05:00
parent 6d9c2eb6b0
commit 8326a09921
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 111 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
tests/unit/test_cloud.py
View file

@ -21,25 +21,27 @@ import salt.cloud
EXAMPLE_PROVIDERS = {
'nyc_vcenter': {'vmware': {'driver': 'vmware',
'password': '123456',
'profiles': {'nyc-vm': {'cluster': 'nycvirt',
'datastore': 'datastore1',
'devices': {'disk': {'Hard disk 1': {'controller': 'SCSI controller 1',
'size': 20}},
'network': {'Network Adapter 1': {'mac': '44:44:44:44:44:42',
'name': 'vlan50',
'switch_type': 'standard'}},
'scsi': {'SCSI controller 1': {'type': 'paravirtual'}}},
'extra_config': {'mem.hotadd': 'yes'},
'folder': 'coreinfra',
'image': 'rhel6_64Guest',
'memory': '8GB',
'num_cpus': 2,
'power_on': True,
'profile': 'nyc-vm',
'provider': 'nyc_vcenter:vmware',
'resourcepool': 'Resources'}},
'url': 'vca1.saltstack.com',
'user': 'root'}}
'minion': {
'master': 'providermaster',
'grains': {
'providergrain': True
}
},
'profiles': {},
'user': 'root'}},
'nj_vcenter': {'vmware': {'driver': 'vmware',
'password': '333',
'profiles': {},
'minion': {
'master': 'providermaster',
'grains': {
'providergrain': True
}
},
'image': 'rhel6_64prod',
'url': 'vca2.saltstack.com',
'user': 'root'}}
}
EXAMPLE_PROFILES = {
@ -47,19 +49,35 @@ EXAMPLE_PROFILES = {
'datastore': 'datastore1',
'devices': {'disk': {'Hard disk 1': {'controller': 'SCSI controller 1',
'size': 20}},
'network': {'Network Adapter 1': {'mac': '44:44:44:44:44:42',
'network': {'Network Adapter 1': {'mac': '88:88:88:88:88:42',
'name': 'vlan50',
'switch_type': 'standard'}},
'scsi': {'SCSI controller 1': {'type': 'paravirtual'}}},
'extra_config': {'mem.hotadd': 'yes'},
'folder': 'coreinfra',
'image': 'rhel6_64Guest',
'minion': {
'master': 'profilemaster',
'grains': {
'profilegrain': True
}
},
'memory': '8GB',
'num_cpus': 2,
'power_on': True,
'profile': 'nyc-vm',
'provider': 'nyc_vcenter:vmware',
'resourcepool': 'Resources'}
'resourcepool': 'Resources'},
'nj-vm': {'cluster': 'njvirt',
'folder': 'coreinfra',
'image': 'rhel6_64Guest',
'memory': '8GB',
'num_cpus': 2,
'power_on': True,
'profile': 'nj-vm',
'provider': 'nj_vcenter:vmware',
'resourcepool': 'Resources'},
}
EXAMPLE_MAP = {
@ -67,7 +85,19 @@ EXAMPLE_MAP = {
'devices': {'disk': {'Hard disk 1': {'size': 40}},
'network': {'Network Adapter 1': {'mac': '22:4a:b2:92:b3:eb'}}},
'memory': '16GB',
'name': 'db1'}}
'minion': {
'master': 'mapmaster',
'grains': {
'mapgrain': True
}
},
'name': 'db1'},
'db2': {'name': 'db2',
'password': '456',
'provider': 'nj_vcenter:vmware'}},
'nj-vm': {'db3': {'name': 'db3',
'password': '789',
}}
}
@ -88,6 +118,7 @@ class MapConfTest(TestCase):
'optimization_order': [0, 1, 2],
'providers': EXAMPLE_PROVIDERS, 'profiles': EXAMPLE_PROFILES}
cloud_map = salt.cloud.Map(opts)
merged_profile = {
'create': {'db1': {'cluster': 'nycvirt',
'cpus': 4,
@ -103,6 +134,10 @@ class MapConfTest(TestCase):
'folder': 'coreinfra',
'image': 'rhel6_64Guest',
'memory': '16GB',
'minion': {'grains': {'mapgrain': True,
'profilegrain': True,
'providergrain': True},
'master': 'mapmaster'},
'name': 'db1',
'num_cpus': 2,
'password': '123456',
@ -111,6 +146,59 @@ class MapConfTest(TestCase):
'provider': 'nyc_vcenter:vmware',
'resourcepool': 'Resources',
'url': 'vca1.saltstack.com',
'user': 'root'}}
'user': 'root'},
'db2': {'cluster': 'nycvirt',
'datastore': 'datastore1',
'devices': {'disk': {'Hard disk 1': {'controller': 'SCSI controller 1',
'size': 20}},
'network': {'Network Adapter 1': {'mac': '88:88:88:88:88:42',
'name': 'vlan50',
'switch_type': 'standard'}},
'scsi': {'SCSI controller 1': {'type': 'paravirtual'}}},
'driver': 'vmware',
'extra_config': {'mem.hotadd': 'yes'},
'folder': 'coreinfra',
'image': 'rhel6_64Guest',
'memory': '8GB',
'minion': {'grains': {'profilegrain': True,
'providergrain': True},
'master': 'profilemaster'},
'name': 'db2',
'num_cpus': 2,
'password': '456',
'power_on': True,
'profile': 'nyc-vm',
'provider': 'nj_vcenter:vmware',
'resourcepool': 'Resources',
'url': 'vca2.saltstack.com',
'user': 'root'},
'db3': {'cluster': 'njvirt',
'driver': 'vmware',
'folder': 'coreinfra',
'image': 'rhel6_64Guest',
'memory': '8GB',
'minion': {'grains': {'providergrain': True},
'master': 'providermaster'},
'name': 'db3',
'num_cpus': 2,
'password': '789',
'power_on': True,
'profile': 'nj-vm',
'provider': 'nj_vcenter:vmware',
'resourcepool': 'Resources',
'url': 'vca2.saltstack.com',
'user': 'root'}}
}
self.assertEqual(cloud_map.map_data(), merged_profile)
# what we assert above w.r.t db2 using nj_vcenter:vmware provider:
# - url is from the overriden nj_vcenter provider, not nyc_vcenter
# - image from provider is still overridden by the nyc-vm profile
# - password from map override is still overriding both the provider and profile password
#
# what we assert above about grain handling ( and provider/profile/map data in general )
# - provider grains are able to be overridden by profile data
# - provider grain sare overridden by map data
# - profile data is overriden by map data
# ie, the provider->profile->map inheritance works as expected
map_data = cloud_map.map_data()
self.assertEqual(map_data, merged_profile)