From f4d388ea508ba00771e43a219ac64e0d430b73bd Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Sun, 25 Jun 2017 21:25:36 -0400 Subject: Migrates Apex to Python Removes all bash libraries and converts almost all of the code to a mixture of Python and Ansible. utils.sh and clean.sh still exist. clean.sh will be migrated fully to clean.py in another patch. The Apex Python package is now built into the opnfv-apex-common RPM. To install locally do 'pip3 install .'. To deploy: opnfv-deploy -d -n --image-dir /root/apex/.build -v --debug Non-python files (THT yaml, settings files, ansible playbooks) are all installed into /usr/share/opnfv-apex/. The RPM will copy settings files into /etc/opnfv-apex/. JIRA: APEX-317 Change-Id: I3232f0329bcd13bce5a28da6a8c9c84d0b048024 Signed-off-by: Tim Rozet --- tests/test_apex_network_environment.py | 170 --------------------------------- 1 file changed, 170 deletions(-) delete mode 100644 tests/test_apex_network_environment.py (limited to 'tests/test_apex_network_environment.py') diff --git a/tests/test_apex_network_environment.py b/tests/test_apex_network_environment.py deleted file mode 100644 index b4d7e717..00000000 --- a/tests/test_apex_network_environment.py +++ /dev/null @@ -1,170 +0,0 @@ -############################################################################## -# Copyright (c) 2016 Dan Radez (Red Hat) -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -import ipaddress - -from copy import copy - -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 - - -class TestNetworkEnvironment(object): - @classmethod - 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') - klass.ns_vlans = NetworkSettings( - '../config/network/network_settings_vlans.yaml') - klass.ns_ipv6 = NetworkSettings( - '../config/network/network_settings_v6.yaml') - - @classmethod - def teardown_class(klass): - """This method is run once for each class _after_ all tests are run""" - - def setUp(self): - """This method is run once before _each_ test method is executed""" - - def teardown(self): - """This method is run once after _each_ test method is executed""" - - def test_init(self): - assert_raises(NetworkEnvException, NetworkEnvironment, - None, '../build/network-environment.yaml') - - def test_netenv_settings_external_network_vlans(self): - # test vlans - ne = NetworkEnvironment(self.ns_vlans, - '../build/network-environment.yaml') - assert_equal(ne['parameter_defaults']['NeutronExternalNetworkBridge'], - '""') - assert_equal(ne['parameter_defaults']['ExternalNetworkVlanID'], 501) - - def test_netenv_settings_external_network_ipv6(self): - # Test IPv6 - ne = NetworkEnvironment(self.ns_ipv6, - '../build/network-environment.yaml') - regstr = ne['resource_registry']['OS::TripleO::Network::External'] - assert_equal(regstr.split('/')[-1], 'external_v6.yaml') - - def test_netenv_settings_external_network_removed(self): - ns = copy(self.ns) - # Test removing EXTERNAL_NETWORK - ns.enabled_network_list.remove(EXTERNAL_NETWORK) - ne = NetworkEnvironment(ns, '../build/network-environment.yaml') - 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') - assert_equal(ne['parameter_defaults']['TenantNetworkVlanID'], 401) - -# Apex is does not support v6 tenant networks -# Though there is code that would fire if a -# v6 cidr was passed in, just uncomment this to -# cover that code -# def test_netenv_settings_tenant_network_v6(self): -# # Test IPv6 -# ne = NetworkEnvironment(self.ns_ipv6, -# '../build/network-environment.yaml') -# regstr = ne['resource_registry'][next(iter(TENANT_RESOURCES.keys()))] -# assert_equal(regstr.split('/')[-1], 'tenant_v6.yaml') - - def test_netenv_settings_tenant_network_removed(self): - ns = copy(self.ns) - # Test removing TENANT_NETWORK - ns.enabled_network_list.remove(TENANT_NETWORK) - ne = NetworkEnvironment(ns, '../build/network-environment.yaml') - 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') - 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') - regstr = ne['resource_registry']['OS::TripleO::Network::Storage'] - assert_equal(regstr.split('/')[-1], 'storage_v6.yaml') - - def test_netenv_settings_storage_network_removed(self): - ns = copy(self.ns) - # Test removing STORAGE_NETWORK - ns.enabled_network_list.remove(STORAGE_NETWORK) - ne = NetworkEnvironment(ns, '../build/network-environment.yaml') - regstr = ne['resource_registry']['OS::TripleO::Network::Storage'] - assert_equal(regstr.split('/')[-1], 'OS::Heat::None') - - def test_netenv_settings_api_network_v4(self): - ns = copy(self.ns_vlans) - ns['networks'][API_NETWORK]['enabled'] = True - ns['networks'][API_NETWORK]['cidr'] = '10.11.12.0/24' - ns = NetworkSettings(ns) - # test vlans - ne = NetworkEnvironment(ns, '../build/network-environment.yaml') - assert_equal(ne['parameter_defaults']['InternalApiNetworkVlanID'], 101) - - def test_netenv_settings_api_network_vlans(self): - ns = copy(self.ns_vlans) - ns['networks'][API_NETWORK]['enabled'] = True - ns = NetworkSettings(ns) - # test vlans - ne = NetworkEnvironment(ns, '../build/network-environment.yaml') - 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') - 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') - 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', - compute_pre_config=True, - controller_pre_config=True) - assert_is_instance(ne, dict) - assert_not_equal(ne, {}) - - def test_exception(self): - e = NetworkEnvException("test") - print(e) - assert_is_instance(e, NetworkEnvException) -- cgit 1.2.3-korg