Added MTU network config and updated flavor_metadata test support

[snaps.git] / snaps / openstack / tests / openstack_tests.py

diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py
index e8e0b75..f3a1df7 100644 (file)
--- 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)