valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #50281 from dubb-b/add_subnet

Browse Source 
Add subnet
This commit is contained in:
Nicole Thomas 2018-10-29 11:20:12 -04:00 committed by GitHub
commit 6ae8a33ced
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration/cloud/providers/test_ec2.py
View File

@ -35,6 +35,7 @@ def __random_name(size=6):
for x in range(size)
)
# Create the cloud instance name to be used throughout the tests
INSTANCE_NAME = __random_name()
PROVIDER_NAME = 'ec2'
@ -47,6 +48,7 @@ class EC2Test(ShellCase):
Integration tests for the EC2 cloud provider in Salt-Cloud
'''
def _installer_name(self):
'''
Determine the downloaded installer name by searching the files
@ -111,10 +113,11 @@ class EC2Test(ShellCase):
key = config[profile_str][PROVIDER_NAME]['key']
key_name = config[profile_str][PROVIDER_NAME]['keyname']
sec_group = config[profile_str][PROVIDER_NAME]['securitygroupname'][0]
subnet_id = config[profile_str][PROVIDER_NAME]['subnet_id']
private_key = config[profile_str][PROVIDER_NAME]['private_key']
location = config[profile_str][PROVIDER_NAME]['location']
conf_items = [id_, key, key_name, sec_group, private_key, location]
conf_items = [id_, key, key_name, sec_group, subnet_id, private_key, location]
missing_conf_item = []
for item in conf_items:
@ -123,7 +126,7 @@ class EC2Test(ShellCase):
if missing_conf_item:
self.skipTest(
'An id, key, keyname, security group, private key, and location must '
'An id, key, keyname, security group, subnet id, private key, and location must '
'be provided to run these tests. One or more of these elements is '
'missing. Check tests/integration/files/conf/cloud.providers.d/{0}.conf'
.format(PROVIDER_NAME)