diff options
Diffstat (limited to 'snaps/openstack/tests')
| -rw-r--r-- | snaps/openstack/tests/conf/os_env.yaml.template | 5 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_network_tests.py | 12 | ||||
| -rw-r--r-- | snaps/openstack/tests/create_stack_tests.py | 12 | ||||
| -rw-r--r-- | snaps/openstack/tests/heat/floating_ip_heat_template.yaml | 4 | ||||
| -rw-r--r-- | snaps/openstack/tests/openstack_tests.py | 16 | ||||
| -rw-r--r-- | snaps/openstack/tests/os_source_file_test.py | 8 |
6 files changed, 37 insertions, 20 deletions
diff --git a/snaps/openstack/tests/conf/os_env.yaml.template b/snaps/openstack/tests/conf/os_env.yaml.template index 36e3cfd..53d500f 100644 --- a/snaps/openstack/tests/conf/os_env.yaml.template +++ b/snaps/openstack/tests/conf/os_env.yaml.template @@ -14,4 +14,7 @@ #os_auth_url: http://<host>:<port>/ #project_name: admin #identity_api_version: 3 -#ext_net: <external network name>
\ No newline at end of file +#ext_net: <external network name> + +flavor_metadata: + hw:mem_page_size: large diff --git a/snaps/openstack/tests/create_network_tests.py b/snaps/openstack/tests/create_network_tests.py index 41eb45a..26c57bd 100644 --- a/snaps/openstack/tests/create_network_tests.py +++ b/snaps/openstack/tests/create_network_tests.py @@ -366,8 +366,10 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) self.net_config = openstack_tests.get_pub_net_config( project_name=self.os_creds.project_name, - net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet', - router_name=guid + '-pub-router', external_net=self.ext_net_name, + net_name="{}-{}".format(guid, 'pub-net'), mtu=999, + subnet_name="{}-{}".format(guid, 'pub-subnet'), + router_name="{}-{}".format(guid, 'pub-router'), + external_net=self.ext_net_name, netconf_override=self.netconf_override) self.neutron = neutron_utils.neutron_client( @@ -402,7 +404,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.assertTrue(neutron_utils_tests.validate_network( self.neutron, self.keystone, self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.os_creds.project_name, mtu=999)) # Validate subnets self.assertTrue(neutron_utils_tests.validate_subnet( @@ -423,7 +425,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.assertTrue(neutron_utils_tests.validate_network( self.neutron, self.keystone, self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.os_creds.project_name, mtu=999)) neutron_utils.delete_network( self.neutron, self.net_creator.get_network()) @@ -453,7 +455,7 @@ class CreateNetworkSuccessTests(OSIntegrationTestCase): self.assertTrue(neutron_utils_tests.validate_network( self.neutron, self.keystone, self.net_creator.network_settings.name, True, - self.os_creds.project_name)) + self.os_creds.project_name, mtu=999)) # Validate subnets self.assertTrue(neutron_utils_tests.validate_subnet( diff --git a/snaps/openstack/tests/create_stack_tests.py b/snaps/openstack/tests/create_stack_tests.py index dc04894..a320aa0 100644 --- a/snaps/openstack/tests/create_stack_tests.py +++ b/snaps/openstack/tests/create_stack_tests.py @@ -569,14 +569,15 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase): self.image_creator = OpenStackImage( self.os_creds, openstack_tests.cirros_image_settings( - name=self.guid + '-image', + name="{}-{}".format(self.guid, 'image'), image_metadata=self.image_metadata)) self.image_creator.create() + flavor_config = openstack_tests.get_flavor_config( + name="{}-{}".format(self.guid, 'flavor-name'), ram=256, disk=10, + vcpus=1, metadata=self.flavor_metadata) self.flavor_creator = OpenStackFlavor( - self.admin_os_creds, - FlavorConfig( - name=self.guid + '-flavor-name', ram=256, disk=10, vcpus=1)) + self.admin_os_creds, flavor_config) self.flavor_creator.create() env_values = { @@ -593,7 +594,8 @@ class CreateStackNestedResourceTests(OSIntegrationTestCase): 'snaps.openstack.tests.heat', 'agent.yaml') stack_settings = StackConfig( - name=self.__class__.__name__ + '-' + str(self.guid) + '-stack', + name="{}-{}".format( + self.__class__.__name__, str(self.guid) + '-stack'), template_path=heat_tmplt_path, resource_files=[heat_resource_path], env_values=env_values) diff --git a/snaps/openstack/tests/heat/floating_ip_heat_template.yaml b/snaps/openstack/tests/heat/floating_ip_heat_template.yaml index a191acc..c8a5f1d 100644 --- a/snaps/openstack/tests/heat/floating_ip_heat_template.yaml +++ b/snaps/openstack/tests/heat/floating_ip_heat_template.yaml @@ -88,12 +88,16 @@ resources: ram: 1024 vcpus: 2 disk: 2 + extra_specs: + hw:mem_page_size: large flavor2: type: OS::Nova::Flavor properties: ram: 1024 vcpus: 2 disk: 2 + extra_specs: + hw:mem_page_size: large network: type: OS::Neutron::Net diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index e8e0b75..f3a1df7 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -313,18 +313,18 @@ def ubuntu_image_settings(name, url=None, image_metadata=None, public=public) -def get_priv_net_config(project_name, net_name, subnet_name, router_name=None, - cidr='10.55.0.0/24', external_net=None, - netconf_override=None): +def get_priv_net_config(project_name, net_name, mtu=None, subnet_name=None, + router_name=None, cidr='10.55.0.0/24', + external_net=None, netconf_override=None): return OSNetworkConfig( - project_name, net_name, subnet_name, cidr, router_name, + project_name, net_name, mtu, subnet_name, cidr, router_name, external_gateway=external_net, netconf_override=netconf_override) def get_pub_net_config( - project_name, net_name, subnet_name=None, router_name=None, + project_name, net_name, mtu=None, subnet_name=None, router_name=None, cidr='10.55.1.0/24', external_net=None, netconf_override=None): - return OSNetworkConfig(project_name, net_name, subnet_name, cidr, + return OSNetworkConfig(project_name, net_name, mtu, subnet_name, cidr, router_name, external_gateway=external_net, netconf_override=netconf_override) @@ -395,7 +395,7 @@ class OSNetworkConfig: physical_network and segmentation_id """ - def __init__(self, project_name, net_name, subnet_name=None, + def __init__(self, project_name, net_name, mtu=None, subnet_name=None, subnet_cidr=None, router_name=None, external_gateway=None, netconf_override=None): """ @@ -405,7 +405,7 @@ class OSNetworkConfig: """ if subnet_name and subnet_cidr: network_conf = NetworkConfig( - name=net_name, subnet_settings=[ + name=net_name, mtu=mtu, subnet_settings=[ SubnetConfig(cidr=subnet_cidr, name=subnet_name)]) else: network_conf = NetworkConfig(name=net_name) diff --git a/snaps/openstack/tests/os_source_file_test.py b/snaps/openstack/tests/os_source_file_test.py index c632e02..bd98ad3 100644 --- a/snaps/openstack/tests/os_source_file_test.py +++ b/snaps/openstack/tests/os_source_file_test.py @@ -63,7 +63,13 @@ class OSComponentTestCase(unittest.TestCase): test_conf = file_utils.read_yaml(dev_os_env_file) self.ext_net_name = test_conf.get('ext_net') - self.flavor_metadata = flavor_metadata + if flavor_metadata: + self.flavor_metadata = flavor_metadata + else: + os_env_dict = file_utils.read_yaml(dev_os_env_file) + flavor_metadata = os_env_dict.get('flavor_metadata') + if flavor_metadata: + self.flavor_metadata = {'metadata': flavor_metadata} self.image_metadata = image_metadata @staticmethod |