diff options
| author |   morganrol <morgan.richomme@orange.com> | 2021-03-31 19:07:11 +0200 |
|---|---|---|
| committer | morganrol <morgan.richomme@orange.com> | 2021-03-31 19:23:15 +0200 |
| commit | c5f7f5e4d905171c1f0663bcb64ee050985a2d0b (patch) | |
| tree | d48441654387a204abfce38da9fa094e70f58631 /src/onaptests/configuration | |
| parent | effb276cbd7d61c6e5ee2d93eb2a7d6baa1d5baa (diff) | |
[CLAMP] Integrate basic_clamp
Some regressions occured and old files were used
This patch update the different components with the right versions
It also renames the vnf-service in basic_clamp-services.yaml
It creates the entry point and the scenario to integrate the test in xtesting
Issue-ID: INT-1819
Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: I7a9e49d8ddc2c5bd0625a4a5ed940c10aed74f81
Diffstat (limited to 'src/onaptests/configuration')
| -rw-r--r-- | src/onaptests/configuration/basic_clamp_settings.py | 11 | ||||
| -rw-r--r-- | src/onaptests/configuration/tca-microservice.yaml | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/onaptests/configuration/basic_clamp_settings.py b/src/onaptests/configuration/basic_clamp_settings.py index d2f38a0..1c6ad61 100644 --- a/src/onaptests/configuration/basic_clamp_settings.py +++ b/src/onaptests/configuration/basic_clamp_settings.py @@ -6,6 +6,13 @@ from .settings import * # pylint: disable=W0614 """ Specific Basic clamp settings.""" CLEANUP_FLAG = False CLAMP_DISTRIBUTION_TIMER = 10 + +# pylint: disable=bad-whitespace +# The ONAP part +SERVICE_DETAILS=("Onboarding, enriching a model with TCA." + + "Design a loop with Clamp and deploy it in Policy and DCAE") +SERVICE_COMPONENTS="SDC, CLAMP, POLICY, DCAE, DMAAP" + VENDOR_NAME = "basiclamp_vendor" VSP_NAME = "basiclamp_vsp" @@ -30,12 +37,10 @@ OPERATIONAL_POLICIES = [ } ] -# SERVICE_NAME = "ubuntu18agent" - # if a yaml file is define, retrieve info from this yaml files # if not declare the parameters in the settings SERVICE_YAML_TEMPLATE = (sys.path[-1] + "/onaptests/templates/vnf-services/" + - "ubuntu18agent-service.yaml") + "basic_clamp-service.yaml") CONFIGURATION_PATH = sys.path[-1] + "/onaptests/configuration/" try: diff --git a/src/onaptests/configuration/tca-microservice.yaml b/src/onaptests/configuration/tca-microservice.yaml index e7d967a..0f13c53 100644 --- a/src/onaptests/configuration/tca-microservice.yaml +++ b/src/onaptests/configuration/tca-microservice.yaml @@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - plugin:k8splugin?version=3.4.2 + - plugin:k8splugin?version=>=3.4.3,<4.0.0 - plugin:clamppolicyplugin?version=1.1.0 inputs: service_name: |