Merge "Fix py27 tests in controllerconfig component"
This commit is contained in:
commit
43d38f3a68
|
@ -2,4 +2,5 @@
|
||||||
.coverage
|
.coverage
|
||||||
.testrepository
|
.testrepository
|
||||||
cover
|
cover
|
||||||
|
.cache
|
||||||
|
|
||||||
|
|
|
@ -2836,7 +2836,7 @@ class ConfigAssistant():
|
||||||
self.nfv_ks_password)
|
self.nfv_ks_password)
|
||||||
self.fm_ks_user_name = config.get(
|
self.fm_ks_user_name = config.get(
|
||||||
'cREGION', 'FM_USER_NAME')
|
'cREGION', 'FM_USER_NAME')
|
||||||
self.panko_ks_password = config.get(
|
self.fm_ks_password = config.get(
|
||||||
'cREGION', 'FM_PASSWORD')
|
'cREGION', 'FM_PASSWORD')
|
||||||
self.add_password_for_validation('FM_PASSWORD',
|
self.add_password_for_validation('FM_PASSWORD',
|
||||||
self.fm_ks_password)
|
self.fm_ks_password)
|
||||||
|
|
|
@ -127,4 +127,4 @@ FM_USER_NAME=fmTWO
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -121,4 +121,4 @@ FM_USER_NAME=fmTWO
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -129,10 +129,10 @@ PANKO_USER_NAME=panko
|
||||||
PANKO_PASSWORD=password2WO*
|
PANKO_PASSWORD=password2WO*
|
||||||
GNOCCHI_USER_NAME=gnocchi
|
GNOCCHI_USER_NAME=gnocchi
|
||||||
GNOCCHI_PASSWORD=password2WO*
|
GNOCCHI_PASSWORD=password2WO*
|
||||||
FM_USER_NAME=fm
|
|
||||||
FM_PASSWORD=password2WO*
|
|
||||||
MTCE_USER_NAME=mtce
|
MTCE_USER_NAME=mtce
|
||||||
MTCE_PASSWORD=password2WO*
|
MTCE_PASSWORD=password2WO*
|
||||||
|
FM_USER_NAME=fm
|
||||||
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[cAUTHENTICATION]
|
[cAUTHENTICATION]
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
|
@ -65,18 +65,6 @@ EXTERNAL_OAM_1_ADDRESS=10.10.10.4
|
||||||
[cNETWORK]
|
[cNETWORK]
|
||||||
# Data Network Configuration
|
# Data Network Configuration
|
||||||
VSWITCH_TYPE=nuage_vrs
|
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]
|
[cSECURITY]
|
||||||
[cREGION]
|
[cREGION]
|
||||||
|
@ -141,10 +129,10 @@ PANKO_USER_NAME=panko
|
||||||
PANKO_PASSWORD=password2WO*
|
PANKO_PASSWORD=password2WO*
|
||||||
GNOCCHI_USER_NAME=gnocchi
|
GNOCCHI_USER_NAME=gnocchi
|
||||||
GNOCCHI_PASSWORD=password2WO*
|
GNOCCHI_PASSWORD=password2WO*
|
||||||
FM_USER_NAME=fm
|
|
||||||
FM_PASSWORD=password2WO*
|
|
||||||
MTCE_USER_NAME=mtce
|
MTCE_USER_NAME=mtce
|
||||||
MTCE_PASSWORD=password2WO*
|
MTCE_PASSWORD=password2WO*
|
||||||
|
FM_USER_NAME=fm
|
||||||
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[cAUTHENTICATION]
|
[cAUTHENTICATION]
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
|
@ -117,4 +117,4 @@ FM_USER_NAME=fm
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -127,4 +127,4 @@ FM_USER_NAME=fm
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -123,4 +123,4 @@ FM_USER_NAME=fm
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -123,4 +123,4 @@ FM_USER_NAME=fm
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -124,4 +124,4 @@ FM_USER_NAME=fm
|
||||||
FM_PASSWORD=password2WO*
|
FM_PASSWORD=password2WO*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -64,4 +64,4 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -61,4 +61,4 @@ PXEBOOT_CIDR=192.168.203.0/24
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -54,4 +54,4 @@ PXEBOOT_CIDR=192.168.203.0/24
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -58,4 +58,4 @@ SUBNET=192.168.203.0/24
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -71,4 +71,4 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -42,7 +42,7 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
||||||
[SYSTEM]
|
[SYSTEM]
|
||||||
SYSTEM_TYPE=All-in-one
|
SYSTEM_TYPE=All-in-one
|
||||||
|
|
|
@ -60,4 +60,4 @@ LOGICAL_INTERFACE=LOGICAL_INTERFACE_2
|
||||||
ADMIN_PASSWORD=Li69nux*
|
ADMIN_PASSWORD=Li69nux*
|
||||||
|
|
||||||
[VERSION]
|
[VERSION]
|
||||||
RELEASE = 18.04
|
RELEASE = TEST.SW.VERSION
|
||||||
|
|
|
@ -9,17 +9,21 @@ import ConfigParser
|
||||||
import difflib
|
import difflib
|
||||||
import filecmp
|
import filecmp
|
||||||
import fileinput
|
import fileinput
|
||||||
|
import mock
|
||||||
from mock import patch
|
from mock import patch
|
||||||
import os
|
import os
|
||||||
import pytest
|
import pytest
|
||||||
import shutil
|
import shutil
|
||||||
|
import sys
|
||||||
|
|
||||||
import controllerconfig.systemconfig as cr
|
|
||||||
import configutilities.common.exceptions as exceptions
|
import configutilities.common.exceptions as exceptions
|
||||||
from configutilities import validate, REGION_CONFIG
|
from configutilities import validate, REGION_CONFIG
|
||||||
import controllerconfig.common.keystone as keystone
|
import controllerconfig.common.keystone as keystone
|
||||||
import test_answerfile
|
import test_answerfile
|
||||||
|
|
||||||
|
sys.modules['fm_core'] = mock.Mock()
|
||||||
|
|
||||||
|
import controllerconfig.systemconfig as cr # noqa: E402
|
||||||
|
|
||||||
FAKE_SERVICE_DATA = {u'services': [
|
FAKE_SERVICE_DATA = {u'services': [
|
||||||
{u'type': u'keystore', u'description': u'Barbican Key Management Service',
|
{u'type': u'keystore', u'description': u'Barbican Key Management Service',
|
||||||
|
|
|
@ -6,13 +6,18 @@ SPDX-License-Identifier: Apache-2.0
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import ConfigParser
|
import ConfigParser
|
||||||
|
import mock
|
||||||
import os
|
import os
|
||||||
import pytest
|
import pytest
|
||||||
|
import sys
|
||||||
|
|
||||||
import controllerconfig.systemconfig as cr
|
|
||||||
import configutilities.common.exceptions as exceptions
|
import configutilities.common.exceptions as exceptions
|
||||||
from configutilities import validate, DEFAULT_CONFIG
|
from configutilities import validate, DEFAULT_CONFIG
|
||||||
|
|
||||||
|
sys.modules['fm_core'] = mock.Mock()
|
||||||
|
|
||||||
|
import controllerconfig.systemconfig as cr # noqa: E402
|
||||||
|
|
||||||
|
|
||||||
def _dump_config(config):
|
def _dump_config(config):
|
||||||
""" Prints contents of config object """
|
""" Prints contents of config object """
|
||||||
|
|
Loading…
Reference in New Issue