diff --git a/controllerconfig/controllerconfig/.gitignore b/controllerconfig/controllerconfig/.gitignore index 59e9c7157e..f6857afabd 100644 --- a/controllerconfig/controllerconfig/.gitignore +++ b/controllerconfig/controllerconfig/.gitignore @@ -2,4 +2,5 @@ .coverage .testrepository cover +.cache diff --git a/controllerconfig/controllerconfig/controllerconfig/configassistant.py b/controllerconfig/controllerconfig/controllerconfig/configassistant.py index 585407aa3a..46eb7f2c95 100644 --- a/controllerconfig/controllerconfig/controllerconfig/configassistant.py +++ b/controllerconfig/controllerconfig/controllerconfig/configassistant.py @@ -2836,7 +2836,7 @@ class ConfigAssistant(): self.nfv_ks_password) self.fm_ks_user_name = config.get( 'cREGION', 'FM_USER_NAME') - self.panko_ks_password = config.get( + self.fm_ks_password = config.get( 'cREGION', 'FM_PASSWORD') self.add_password_for_validation('FM_PASSWORD', self.fm_ks_password) diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly index 039456b9ad..86237577f6 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.share.keystoneonly @@ -127,4 +127,4 @@ FM_USER_NAME=fmTWO FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall index 55d4b5a1ea..02454d8559 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/TiS_region_config.shareall @@ -121,4 +121,4 @@ FM_USER_NAME=fmTWO FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region index 553f89f2e3..bd897d8d3b 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region @@ -129,10 +129,10 @@ PANKO_USER_NAME=panko PANKO_PASSWORD=password2WO* GNOCCHI_USER_NAME=gnocchi GNOCCHI_PASSWORD=password2WO* -FM_USER_NAME=fm -FM_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* +FM_USER_NAME=fm +FM_PASSWORD=password2WO* [cAUTHENTICATION] ADMIN_PASSWORD=Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs index 8b1adbfac0..e6157df94c 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/cgcs_config.region_nuage_vrs @@ -65,18 +65,6 @@ EXTERNAL_OAM_1_ADDRESS=10.10.10.4 [cNETWORK] # Data Network Configuration VSWITCH_TYPE=nuage_vrs -NEUTRON_L2_PLUGIN=NC -NEUTRON_L2_AGENT=nuage_vrs -NEUTRON_L3_EXT_BRIDGE=provider -NEUTRON_ML2_MECHANISM_DRIVERS=NC -NEUTRON_ML2_TYPE_DRIVERS=NC -NEUTRON_ML2_TENANT_NETWORK_TYPES=vlan,vxlan -NEUTRON_ML2_SRIOV_AGENT_REQUIRED=NC -NEUTRON_HOST_DRIVER=NC -NEUTRON_FM_DRIVER=NC -NEUTRON_NETWORK_SCHEDULER=NC -NEUTRON_ROUTER_SCHEDULER=NC -METADATA_PROXY_SHARED_SECRET=NuageNetworksSharedSecret [cSECURITY] [cREGION] @@ -141,10 +129,10 @@ PANKO_USER_NAME=panko PANKO_PASSWORD=password2WO* GNOCCHI_USER_NAME=gnocchi GNOCCHI_PASSWORD=password2WO* -FM_USER_NAME=fm -FM_PASSWORD=password2WO* MTCE_USER_NAME=mtce MTCE_PASSWORD=password2WO* +FM_USER_NAME=fm +FM_PASSWORD=password2WO* [cAUTHENTICATION] ADMIN_PASSWORD=Li69nux* diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan index 426e4bbfd2..042c38eae1 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.lag.vlan @@ -117,4 +117,4 @@ FM_USER_NAME=fm FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs index 1dee3ec6ea..d05b224845 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.nuage_vrs @@ -127,4 +127,4 @@ FM_USER_NAME=fm FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security index afaa9fc156..f89bb0d3ed 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.security @@ -123,4 +123,4 @@ FM_USER_NAME=fm FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple index a5b97f559e..51c119f842 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple @@ -123,4 +123,4 @@ FM_USER_NAME=fm FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips index ac639c9b15..ac69a1ca19 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/region_config.simple.can_ips @@ -124,4 +124,4 @@ FM_USER_NAME=fm FM_PASSWORD=password2WO* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ceph b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ceph index 83a8c548c0..4b4c8a53ca 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ceph +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ceph @@ -64,4 +64,4 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ipv6 b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ipv6 index d6a578357d..09df30fe09 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ipv6 +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.ipv6 @@ -61,4 +61,4 @@ PXEBOOT_CIDR=192.168.203.0/24 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.lag.vlan b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.lag.vlan index f35a3b90ba..cc33f66097 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.lag.vlan +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.lag.vlan @@ -54,4 +54,4 @@ PXEBOOT_CIDR=192.168.203.0/24 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.security b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.security index d36db444f1..bfb6d8cc38 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.security +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.security @@ -58,4 +58,4 @@ SUBNET=192.168.203.0/24 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simple b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simple index 41b9525c46..606e52aff8 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simple +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simple @@ -71,4 +71,4 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simplex b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simplex index ce965e5973..3d9935b97d 100644 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simplex +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.simplex @@ -42,7 +42,7 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION [SYSTEM] SYSTEM_TYPE=All-in-one diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.static_addr b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.static_addr index bc1e426b49..b8d0f7d2e1 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.static_addr +++ b/controllerconfig/controllerconfig/controllerconfig/tests/files/system_config.static_addr @@ -60,4 +60,4 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2 ADMIN_PASSWORD=Li69nux* [VERSION] -RELEASE = 18.04 +RELEASE = TEST.SW.VERSION diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py b/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py index 60ec25c102..7e54fee3c5 100755 --- a/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py +++ b/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py @@ -9,17 +9,21 @@ import ConfigParser import difflib import filecmp import fileinput +import mock from mock import patch import os import pytest import shutil +import sys -import controllerconfig.systemconfig as cr import configutilities.common.exceptions as exceptions from configutilities import validate, REGION_CONFIG import controllerconfig.common.keystone as keystone import test_answerfile +sys.modules['fm_core'] = mock.Mock() + +import controllerconfig.systemconfig as cr # noqa: E402 FAKE_SERVICE_DATA = {u'services': [ {u'type': u'keystore', u'description': u'Barbican Key Management Service', diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py b/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py index c23cd86727..87ba7226e9 100644 --- a/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py +++ b/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py @@ -6,13 +6,18 @@ SPDX-License-Identifier: Apache-2.0 """ import ConfigParser +import mock import os import pytest +import sys -import controllerconfig.systemconfig as cr import configutilities.common.exceptions as exceptions from configutilities import validate, DEFAULT_CONFIG +sys.modules['fm_core'] = mock.Mock() + +import controllerconfig.systemconfig as cr # noqa: E402 + def _dump_config(config): """ Prints contents of config object """