From 7eb571d9eed1b0d83b0d9e79d3ffdf9a02aad6c9 Mon Sep 17 00:00:00 2001 From: Kristine Bujold Date: Mon, 1 Apr 2019 15:49:46 -0400 Subject: [PATCH] Remove wrs-configutilities SDK Module Some of the APIs/constants 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: 30263 Depends-On: https://review.openstack.org/#/c/649175 Change-Id: I86b9857207135525de1687adff4657637060074a Signed-off-by: Kristine Bujold --- bsp-files/filter_out_from_worker | 1 - bsp-files/filter_out_from_worker_lowlatency | 1 - inventory/inventory/inventory/api/controllers/v1/host.py | 4 ++-- inventory/inventory/tox.ini | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bsp-files/filter_out_from_worker b/bsp-files/filter_out_from_worker index 82e3fe99..3d9487bd 100644 --- a/bsp-files/filter_out_from_worker +++ b/bsp-files/filter_out_from_worker @@ -237,7 +237,6 @@ python-keystone python-novaclient-doc python-panko python2-pankoclient -configutilities drbd-bash-completion drbd-udev drbd-utils diff --git a/bsp-files/filter_out_from_worker_lowlatency b/bsp-files/filter_out_from_worker_lowlatency index 52152b2c..d2526d5d 100644 --- a/bsp-files/filter_out_from_worker_lowlatency +++ b/bsp-files/filter_out_from_worker_lowlatency @@ -241,7 +241,6 @@ python-keystone python-novaclient-doc python-panko python2-pankoclient -configutilities drbd-bash-completion drbd-udev drbd-utils diff --git a/inventory/inventory/inventory/api/controllers/v1/host.py b/inventory/inventory/inventory/api/controllers/v1/host.py index dbc8261b..5db31455 100644 --- a/inventory/inventory/inventory/api/controllers/v1/host.py +++ b/inventory/inventory/inventory/api/controllers/v1/host.py @@ -16,14 +16,14 @@ # License for the specific language governing permissions and limitations # under the License. # -# Copyright (c) 2013-2018 Wind River Systems, Inc. +# Copyright (c) 2013-2019 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # import ast import cgi -from configutilities import HOST_XML_ATTRIBUTES +from controllerconfig import HOST_XML_ATTRIBUTES import copy from fm_api import constants as fm_constants from inventory.api.controllers.v1 import base diff --git a/inventory/inventory/tox.ini b/inventory/inventory/tox.ini index 5e37d4d6..b3fa3212 100644 --- a/inventory/inventory/tox.ini +++ b/inventory/inventory/tox.ini @@ -27,7 +27,6 @@ setenv = deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -e{[tox]cgcsdir}/stx-update/tsconfig/tsconfig - -e{[tox]cgcsdir}/stx-config/configutilities/configutilities -e{[tox]cgcsdir}/stx-config/sysinv/cgts-client/cgts-client -e{[tox]cgcsdir}/stx-fault/fm-api -e{[tox]cgcsdir}/stx-fault/python-fmclient/fmclient @@ -56,7 +55,6 @@ commands = {posargs} [testenv:cover] deps = {[testenv]deps} -e{[tox]cgcsdir}/stx-update/tsconfig/tsconfig - -e{[tox]cgcsdir}/stx-config/configutilities/configutilities -e{[tox]cgcsdir}/stx-fault/fm-api -e{[tox]cgcsdir}/stx-fault/python-fmclient/fmclient -e{[tox]cgcsdir}/stx-config/controllerconfig/controllerconfig