diff --git a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py deleted file mode 100644 index 5587e5f..0000000 --- a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) 2020 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -import yaml - - -class quoted_str(str): - pass - - -# force strings to be single-quoted to avoid interpretation as numeric values -def quoted_presenter(dumper, data): - return dumper.represent_scalar(u'tag:yaml.org,2002:str', data, style="'") - - -yaml.add_representer(quoted_str, quoted_presenter) diff --git a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py deleted file mode 100644 index bad3c44..0000000 --- a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/armada/manifest_snmp.py +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2020 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -# All Rights Reserved. -# - -""" System inventory Armada manifest operator.""" - -from sysinv.common import constants -from sysinv.helm import manifest_base as base - -class SnmpArmadaManifestOperator(base.ArmadaManifestOperator): - - APP = constants.HELM_APP_SNMP - ARMADA_MANIFEST = 'armada-manifest' - - # TODO: remove this once Ic83fbd25d23ae34889cb288330ec448f920bda39 merges - def app_lifecycle_actions(self, context, conductor_obj, dbapi, operation, relative_timing): - if operation == constants.APP_APPLY_OP or operation == constants.APP_REMOVE_OP: - if relative_timing == constants.APP_LIFECYCLE_POST: - config_dict = { - "personalities": [constants.CONTROLLER], - "classes": ['platform::fm::runtime'] - } - config_uuid = conductor_obj._config_update_hosts(context, config_dict['personalities']) - conductor_obj._config_apply_runtime_manifest(context, config_uuid, config_dict) - - def platform_mode_manifest_updates(self, dbapi, mode): - """ Update the application manifest based on the platform - - :param dbapi: DB api object - :param mode: mode to control how to apply the application manifest - """ - pass diff --git a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py index 97e5a9a..6c9834c 100644 --- a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py +++ b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_plugins.py @@ -10,7 +10,6 @@ from k8sapp_snmp.helm.snmp import SnmpHelm from sysinv.common import constants from sysinv.tests.db import base as dbbase -from sysinv.tests.helm.test_helm import HelmOperatorTestSuiteMixin class K8SAppSnmpAppMixin(object): @@ -33,7 +32,6 @@ class K8SAppSnmpAppMixin(object): class K8sAppSnmpControllerTestCase(K8SAppSnmpAppMixin, dbbase.BaseIPv6Mixin, dbbase.BaseCephStorageBackendMixin, - HelmOperatorTestSuiteMixin, dbbase.ControllerHostTestCase): pass @@ -45,6 +43,5 @@ class K8sAppSnmpControllerTestCase(K8SAppSnmpAppMixin, # - snmp app class K8SAppSnmpAIOTestCase(K8SAppSnmpAppMixin, dbbase.BaseCephStorageBackendMixin, - HelmOperatorTestSuiteMixin, dbbase.AIOSimplexHostTestCase): pass diff --git a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py index e078299..437c389 100644 --- a/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py +++ b/python3-k8sapp-snmp/k8sapp_snmp/k8sapp_snmp/tests/test_snmp.py @@ -21,6 +21,8 @@ class SnmpTestCase(test_plugins.K8SAppSnmpAppMixin, self.app = dbutils.create_test_app(name='snmp') self.dbapi = dbapi.get_instance() -class SnmpTestCase(SnmpTestCase, dbbase.ProvisionedControllerHostTestCase): - pass +class SnmpTestCaseDummy(SnmpTestCase, dbbase.ProvisionedControllerHostTestCase): + # without a test zuul will fail + def test_dummy(self): + pass diff --git a/python3-k8sapp-snmp/k8sapp_snmp/setup.cfg b/python3-k8sapp-snmp/k8sapp_snmp/setup.cfg index 4cf6052..eb8ff89 100644 --- a/python3-k8sapp-snmp/k8sapp_snmp/setup.cfg +++ b/python3-k8sapp-snmp/k8sapp_snmp/setup.cfg @@ -35,9 +35,6 @@ systemconfig.helm_applications = systemconfig.helm_plugins.snmp = 001_snmp = k8sapp_snmp.helm.snmp:SnmpHelm -systemconfig.armada.manifest_ops = - snmp = k8sapp_snmp.armada.manifest_snmp:SnmpArmadaManifestOperator - systemconfig.app_lifecycle = snmp = k8sapp_snmp.lifecycle.lifecycle_snmp:SnmpAppLifecycleOperator