Code Review / apex.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Migrates Apex to Python
[apex.git] / apex / tests / test_apex_network_environment.py
diff --git a/tests/test_apex_network_environment.py b/apex/tests/test_apex_network_environment.py
similarity index 77%
rename from tests/test_apex_network_environment.py
rename to apex/tests/test_apex_network_environment.py
index b4d7e71..5047adb 100644 (file)
--- a/tests/test_apex_network_environment.py
+++ b/apex/tests/test_apex_network_environment.py
@@ -7,29 +7,26 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-import ipaddress
+import os
 
 from copy import copy
 
+from nose.tools import assert_equal
+from nose.tools import assert_is_instance
+from nose.tools import assert_not_equal
+from nose.tools import assert_raises
+
 from apex.common.constants import (
     EXTERNAL_NETWORK,
     TENANT_NETWORK,
     STORAGE_NETWORK,
     API_NETWORK,
-    CONTROLLER)
-from apex.network_settings import NetworkSettings
-from apex.network_environment import (
-    NetworkEnvironment,
-    NetworkEnvException,
-    EXTERNAL_RESOURCES,
-    TENANT_RESOURCES,
-    STORAGE_RESOURCES,
-    API_RESOURCES)
-
-from nose.tools import assert_equal
-from nose.tools import assert_raises
-from nose.tools import assert_is_instance
-from nose.tools import assert_not_equal
+    NET_ENV_FILE)
+from apex import NetworkEnvironment
+from apex.network.network_environment import NetworkEnvException
+from apex import NetworkSettings
+from apex.tests.constants import TEST_CONFIG_DIR
+from apex.tests.constants import TEST_BUILD_DIR
 
 
 class TestNetworkEnvironment(object):
@@ -37,11 +34,12 @@ class TestNetworkEnvironment(object):
     def setup_class(klass):
         """This method is run once for each class before any tests are run"""
         klass.ns = NetworkSettings(
-            '../config/network/network_settings.yaml')
+            os.path.join(TEST_CONFIG_DIR, 'network/network_settings.yaml'))
         klass.ns_vlans = NetworkSettings(
-            '../config/network/network_settings_vlans.yaml')
+            os.path.join(TEST_CONFIG_DIR,
+                         'network/network_settings_vlans.yaml'))
         klass.ns_ipv6 = NetworkSettings(
-            '../config/network/network_settings_v6.yaml')
+            os.path.join(TEST_CONFIG_DIR, 'network/network_settings_v6.yaml'))
 
     @classmethod
     def teardown_class(klass):
@@ -55,12 +53,12 @@ class TestNetworkEnvironment(object):
 
     def test_init(self):
         assert_raises(NetworkEnvException, NetworkEnvironment,
-                      None, '../build/network-environment.yaml')
+                      None, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
 
     def test_netenv_settings_external_network_vlans(self):
         # test vlans
         ne = NetworkEnvironment(self.ns_vlans,
-                                '../build/network-environment.yaml')
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         assert_equal(ne['parameter_defaults']['NeutronExternalNetworkBridge'],
                      '""')
         assert_equal(ne['parameter_defaults']['ExternalNetworkVlanID'], 501)
@@ -68,7 +66,7 @@ class TestNetworkEnvironment(object):
     def test_netenv_settings_external_network_ipv6(self):
         # Test IPv6
         ne = NetworkEnvironment(self.ns_ipv6,
-                                '../build/network-environment.yaml')
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::External']
         assert_equal(regstr.split('/')[-1], 'external_v6.yaml')
 
@@ -76,14 +74,14 @@ class TestNetworkEnvironment(object):
         ns = copy(self.ns)
         # Test removing EXTERNAL_NETWORK
         ns.enabled_network_list.remove(EXTERNAL_NETWORK)
-        ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
+        ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::External']
         assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_netenv_settings_tenant_network_vlans(self):
         # test vlans
         ne = NetworkEnvironment(self.ns_vlans,
-                                '../build/network-environment.yaml')
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         assert_equal(ne['parameter_defaults']['TenantNetworkVlanID'], 401)
 
 # Apex is does not support v6 tenant networks
@@ -101,20 +99,20 @@ class TestNetworkEnvironment(object):
         ns = copy(self.ns)
         # Test removing TENANT_NETWORK
         ns.enabled_network_list.remove(TENANT_NETWORK)
-        ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
+        ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::Tenant']
         assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_netenv_settings_storage_network_vlans(self):
         # test vlans
         ne = NetworkEnvironment(self.ns_vlans,
-                                '../build/network-environment.yaml')
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         assert_equal(ne['parameter_defaults']['StorageNetworkVlanID'], 201)
 
     def test_netenv_settings_storage_network_v6(self):
         # Test IPv6
         ne = NetworkEnvironment(self.ns_ipv6,
-                                '../build/network-environment.yaml')
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::Storage']
         assert_equal(regstr.split('/')[-1], 'storage_v6.yaml')
 
@@ -122,7 +120,7 @@ class TestNetworkEnvironment(object):
         ns = copy(self.ns)
         # Test removing STORAGE_NETWORK
         ns.enabled_network_list.remove(STORAGE_NETWORK)
-        ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
+        ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::Storage']
         assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
@@ -132,7 +130,7 @@ class TestNetworkEnvironment(object):
         ns['networks'][API_NETWORK]['cidr'] = '10.11.12.0/24'
         ns = NetworkSettings(ns)
         # test vlans
-        ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
+        ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         assert_equal(ne['parameter_defaults']['InternalApiNetworkVlanID'], 101)
 
     def test_netenv_settings_api_network_vlans(self):
@@ -140,25 +138,26 @@ class TestNetworkEnvironment(object):
         ns['networks'][API_NETWORK]['enabled'] = True
         ns = NetworkSettings(ns)
         # test vlans
-        ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
+        ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         assert_equal(ne['parameter_defaults']['InternalApiNetworkVlanID'], 101)
 
     def test_netenv_settings_api_network_v6(self):
         # Test IPv6
         ne = NetworkEnvironment(self.ns_ipv6,
-                                '../build/network-environment.yaml')
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::InternalApi']
         assert_equal(regstr.split('/')[-1], 'internal_api_v6.yaml')
 
     def test_netenv_settings_api_network_removed(self):
         ns = copy(self.ns)
         # API_NETWORK is not in the default network settings file
-        ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
+        ne = NetworkEnvironment(ns, os.path.join(TEST_BUILD_DIR, NET_ENV_FILE))
         regstr = ne['resource_registry']['OS::TripleO::Network::InternalApi']
         assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_numa_configs(self):
-        ne = NetworkEnvironment(self.ns, '../build/network-environment.yaml',
+        ne = NetworkEnvironment(self.ns,
+                                os.path.join(TEST_BUILD_DIR, NET_ENV_FILE),
                                 compute_pre_config=True,
                                 controller_pre_config=True)
         assert_is_instance(ne, dict)