starlingx
/
distcloud
Code Issues Proposed changes

Remove wrs-configutilities SDK Module 

Some of the APIs were moved to controllerconfig.

With the StarlingX move to supporting pure upstream OpenStack, the
majority of the SDK Modules are related to functionality no longer
supported. The remaining SDK Modules will be moved to StarlingX
documentation.

Story: 2005275
Task: 30265
Depends-On: https://review.openstack.org/#/c/649175

Change-Id: I2044761b3e653b6862ece2cf82dd8135b059b60d
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-04-01 15:56:18 -04:00
parent ae73fe3469
commit 9b3af14ec5
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dcmanager/api/controllers/v1/subclouds.py
View File

@ -13,11 +13,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
# Copyright (c) 2017-2018 Wind River Systems, Inc. # Copyright (c) 2017-2019 Wind River Systems, Inc.
# #
# The right to copy, distribute, modify, or otherwise make use # SPDX-License-Identifier: Apache-2.0
# of this software may be licensed only pursuant to the terms
# of an applicable Wind River license agreement.
# #
import keyring import keyring
@ -32,10 +30,10 @@ import pecan
from pecan import expose from pecan import expose
from pecan import request from pecan import request
from configutilities.common import crypt from controllerconfig.common import crypt
from configutilities.common.exceptions import ValidateFail from controllerconfig.common.exceptions import ValidateFail
from configutilities.common.utils import validate_address_str from controllerconfig.utils import validate_address_str
from configutilities.common.utils import validate_network_str from controllerconfig.utils import validate_network_str
from dcorch.drivers.openstack.keystone_v3 import KeystoneClient from dcorch.drivers.openstack.keystone_v3 import KeystoneClient

8
tox.ini
View File

@ -12,7 +12,7 @@ fmclient_src_dir = {[dc]stx_fault_dir}/python-fmclient/fmclient
fm_api_src_dir = {[dc]stx_fault_dir}/fm-api fm_api_src_dir = {[dc]stx_fault_dir}/fm-api
sysinv_src_dir = ../stx-config/sysinv/sysinv/sysinv sysinv_src_dir = ../stx-config/sysinv/sysinv/sysinv
tsconfig_src_dir = ../stx-update/tsconfig/tsconfig tsconfig_src_dir = ../stx-update/tsconfig/tsconfig
configutilities_src_dir = ../stx-config/configutilities/configutilities controllerconfig_src_dir = ../stx-config/controllerconfig/controllerconfig
cgtsclient_src_dir = ../stx-config/sysinv/cgts-client/cgts-client cgtsclient_src_dir = ../stx-config/sysinv/cgts-client/cgts-client
[testenv] [testenv]
@ -43,7 +43,7 @@ deps = -r{toxinidir}/test-requirements.txt
-e../{[dc]tsconfig_src_dir} -e../{[dc]tsconfig_src_dir}
-e../{[dc]fmclient_src_dir} -e../{[dc]fmclient_src_dir}
-e../{[dc]fm_api_src_dir} -e../{[dc]fm_api_src_dir}
-e../{[dc]configutilities_src_dir} -e../{[dc]controllerconfig_src_dir}
-e../{[dc]cgtsclient_src_dir} -e../{[dc]cgtsclient_src_dir}
setenv = setenv =
CURRENT_CFG_FILE={toxinidir}/.current.cfg CURRENT_CFG_FILE={toxinidir}/.current.cfg
@ -63,7 +63,7 @@ deps = -r{toxinidir}/test-requirements.txt
-e{[dc]tsconfig_src_dir} -e{[dc]tsconfig_src_dir}
-e{[dc]fmclient_src_dir} -e{[dc]fmclient_src_dir}
-e{[dc]fm_api_src_dir} -e{[dc]fm_api_src_dir}
-e{[dc]configutilities_src_dir} -e{[dc]controllerconfig_src_dir}
-e{[dc]cgtsclient_src_dir} -e{[dc]cgtsclient_src_dir}
setenv = setenv =
CURRENT_CFG_FILE={toxinidir}/.current.cfg CURRENT_CFG_FILE={toxinidir}/.current.cfg
@ -101,7 +101,7 @@ deps = -r{toxinidir}/test-requirements.txt
-e../{[dc]tsconfig_src_dir} -e../{[dc]tsconfig_src_dir}
-e../{[dc]fmclient_src_dir} -e../{[dc]fmclient_src_dir}
-e../{[dc]fm_api_src_dir} -e../{[dc]fm_api_src_dir}
-e../{[dc]configutilities_src_dir} -e../{[dc]controllerconfig_src_dir}
-e../{[dc]cgtsclient_src_dir} -e../{[dc]cgtsclient_src_dir}
setenv = setenv =
CURRENT_CFG_FILE={toxinidir}/.current.cfg CURRENT_CFG_FILE={toxinidir}/.current.cfg