From 72d22a4339db09824d46746dacbba1e141763dc0 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Tue, 26 Mar 2019 09:49:13 -0400 Subject: Migrate ccdsk/apps to ccsdk/cds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I020a2ccec4e691717f888e8bd2afec91a7c4e987 Issue-ID: CCSDK-1178 Signed-off-by: Alexis de Talhouët --- .../src/test/resources/application.properties | 41 --- .../enhance/enhance-resource-assignment.json | 62 ---- .../test/resources/enhance/enhance-template.json | 351 --------------------- .../test/resources/enhance/enhanced-template.json | 327 ------------------- .../modules/service/src/test/resources/logback.xml | 40 --- .../model_type/data_type/datatype-property.json | 27 -- .../test/resources/resourcedictionary/automap.json | 14 - .../resourcedictionary/default_definition.json | 17 - 8 files changed, 879 deletions(-) delete mode 100755 ms/controllerblueprints/modules/service/src/test/resources/application.properties delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/logback.xml delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json delete mode 100644 ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json (limited to 'ms/controllerblueprints/modules/service/src/test/resources') diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties deleted file mode 100755 index 011bad32..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties +++ /dev/null @@ -1,41 +0,0 @@ -# -# Copyright © 2017-2018 AT&T Intellectual Property. -# Modifications Copyright © 2018 IBM. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -spring.main.banner-mode=off -spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false -logging.level.org.springframework.web=INFO -logging.level.org.hibernate.SQL=warn -logging.level.org.hibernate.type.descriptor.sql=debug -# Load Resource Source Mappings -resourceSourceMappings=processor-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,capability=source-capability -# Controller Blueprints Core Configuration -controllerblueprints.blueprintDeployPath=./target/blueprints/deploy -controllerblueprints.blueprintArchivePath=./target/blueprints/archive -controllerblueprints.blueprintEnrichmentPath=./target/blueprints/enrichment -# Controller Blueprint Load Configurations -controllerblueprints.loadInitialData=false -controllerblueprints.loadBluePrint=false -controllerblueprints.loadBluePrintPaths=./../../../../components/model-catalog/blueprint-model/test-blueprint -controllerblueprints.loadModelType=false -controllerblueprints.loadModeTypePaths=./../../../../components/model-catalog/definition-type/starter-type -controllerblueprints.loadResourceDictionary=false -controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-catalog/resource-dictionary/starter-dictionary - -# CBA file extension -controllerblueprints.loadCbaExtension=zip - -# CBA examples for tests cases -controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint \ No newline at end of file diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json deleted file mode 100644 index 3ed188b9..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json +++ /dev/null @@ -1,62 +0,0 @@ -[ - { - "name": "rs-db-source", - "input-param": true, - "property": { - "type": "string", - "required": true - }, - "dictionary-name": "sample-db-source", - "dictionary-source": "primary-db", - "dependencies": [ - "input-source" - ] - }, - { - "name": "ra-default-source", - "input-param": true, - "property": { - "type": "string", - "required": true - }, - "dictionary-name": "sample-default-source", - "dictionary-source": "default", - "dependencies": [] - }, - { - "name": "ra-input-source", - "input-param": true, - "property": { - "type": "string", - "required": true - }, - "dictionary-name": "sample-input-source", - "dictionary-source": "input", - "dependencies": [] - }, - { - "name": "ra-list-input-source", - "input-param": true, - "property": { - "type": "list", - "required": true, - "entry_schema": { - "type": "string" - } - }, - "dictionary-name": "ra-list-input-source", - "dictionary-source": "input", - "dependencies": [] - }, - { - "name": "ra-complex-input-source", - "input-param": true, - "property": { - "type": "dt-v4-aggregate", - "required": true - }, - "dictionary-name": "sample-mdsal-source", - "dictionary-source": "primary-config-data", - "dependencies": [] - } -] diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json deleted file mode 100644 index 2e48b6d8..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json +++ /dev/null @@ -1,351 +0,0 @@ -{ - "metadata": { - "template_author": "Brinda Santh", - "template_name": "enhance-template", - "template_version": "1.0.0", - "template_tags": "brinda, VPE", - "service-type": "Sample Service", - "release": "1806", - "vnf-type": "VPE" - }, - "topology_template": { - "inputs": { - "request-id": { - "required": true, - "type": "string" - }, - "service-instance-id": { - "required": true, - "type": "string" - }, - "scope-type": { - "required": true, - "type": "string" - }, - "action-name": { - "required": true, - "type": "string" - }, - "hostname": { - "required": true, - "type": "string" - } - }, - "node_templates": { - "vpe-netconf-device": { - "capabilities": { - "netconf": { - "properties": { - "login-key": "sdnc", - "login-account": "sndc-local", - "source": "local", - "target-ip-address": { - "get_attribute": [ - "SELF", - "lo0-local-ipv4-address" - ] - }, - "port-number": 22, - "connection-time-out": 30 - } - } - }, - "type": "vnf-netconf-device" - }, - "activate-netconf-component": { - "capabilities": { - "component-node": {} - }, - "requirements": { - "netconf-connection": { - "capability": "netconf", - "node": "vpe-netconf-device", - "relationship": "tosca.relationships.ConnectsTo" - } - }, - "interfaces": { - "NetconfExecutorComponent": { - "operations": { - "process": { - "inputs": { - "action-name": { - "get_input": "action-name" - }, - "template-name": { - "get_input": "template_name" - }, - "template-version": { - "get_input": "template_version" - }, - "resource-type": "vnf-type", - "request-id": { - "get_input": "request-id" - }, - "resource-id": { - "get_input": "hostname" - }, - "execution-script": "execution-script" - }, - "outputs": { - "response-data": { - "get_attribute": [ - "SELF", - "netconf-executor-baseconfig.response-data" - ] - }, - "status": { - "get_attribute": [ - "SELF", - "netconf-executor-baseconfig.status" - ] - } - }, - "implementation": { - "primary": "file://netconf_adaptor/DefaultBaseLicenceConfig.py" - } - } - } - } - }, - "type": "component-netconf-executor" - }, - "resource-assignment-ra-component": { - "capabilities": { - "component-node": {} - }, - "interfaces": { - "ResourceAssignmentComponent": { - "operations": { - "process": { - "inputs": { - "template-names": [ - "base-config-template", - "licence-template" - ], - "action-name": { - "get_input": "action-name" - }, - "template-name": { - "get_input": "template_name" - }, - "template-version": { - "get_input": "template-version" - }, - "resource-type": "vnf-type", - "request-id": { - "get_input": "request-id" - }, - "resource-id": { - "get_input": "hostname" - } - }, - "outputs": { - "resource-assignment-params": "success", - "status": "status" - } - } - } - } - }, - "type": "component-resource-assignment" - }, - "resource-assignment-action": { - "properties": { - "mode": "sync", - "version": "LATEST", - "is-start-flow": false - }, - "requirements": { - "component-dependency": { - "capability": "component-node", - "node": "resource-assignment-ra-component", - "relationship": "tosca.relationships.DependsOn" - } - }, - "capabilities": { - "dg-node": {} - }, - "interfaces": { - "CONFIG": { - "operations": { - "ResourceAssignment": { - "inputs": { - "params": [] - } - } - } - } - }, - "type": "dg-resource-assignment" - }, - "activate-action": { - "properties": { - "mode": "sync", - "version": "LATEST", - "is-start-flow": false - }, - "requirements": { - "component-dependency": { - "capability": "component-node", - "node": "activate-netconf-component", - "relationship": "tosca.relationships.DependsOn" - } - }, - "capabilities": { - "dg-node": {} - }, - "interfaces": { - "CONFIG": { - "operations": { - "ActivateNetconf": { - "inputs": { - "params": [] - } - } - } - } - }, - "type": "dg-activate-netconf" - }, - "base-config-template": { - "capabilities": { - "content": { - "properties": { - "content": "db://base-config-template" - } - }, - "mapping": { - "properties": { - "mapping": [ - { - "name": "rs-db-source", - "property": { - "required": true, - "type": "string" - }, - "input-param": false, - "dictionary-name": "sample-db-source", - "dictionary-source": "primary-db", - "dependencies": [ - "hostname" - ], - "version": 0 - }, - { - "name": "mdsal-source", - "property": { - "description": "", - "required": true, - "type": "list", - "entry_schema": { - "type": "dt-v4-aggregate" - } - }, - "input-param": false, - "dictionary-name": "sample-mdsal-source", - "dictionary-source": "primary-config-data", - "dependencies": [ - "service-instance-id" - ], - "version": 0 - }, - { - "name": "hostname", - "property": { - "required": true, - "type": "string" - }, - "dictionary-name": "hostname", - "dictionary-source": "input", - "version": 0, - "input-param": false - }, - { - "name": "service", - "property": { - "required": true, - "type": "string" - }, - "dictionary-name": "service", - "dictionary-source": "input", - "version": 0, - "input-param": false - }, - { - "name": "service-instance-id", - "property": { - "required": true, - "type": "string" - }, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", - "version": 0, - "input-param": false - } - ] - } - } - }, - "properties": { - "action-names": [ - "resource-assignment-action" - ] - }, - "type": "artifact-config-template" - }, - "licence-template": { - "capabilities": { - "content": { - "properties": { - "content": "db://licence-template" - } - }, - "mapping": { - "properties": { - "mapping": [ - { - "name": "licenses", - "property": { - "required": true, - "type": "list", - "entry_schema": { - "type": "dt-license-key" - } - }, - "input-param": false, - "dictionary-name": "sample-licenses", - "dictionary-source": "primary-config-data", - "dependencies": [ - "service-instance-id" - ], - "version": 0 - }, - { - "name": "service-instance-id", - "property": { - "required": true, - "type": "string" - }, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", - "version": 0, - "input-param": false - } - ] - } - } - }, - "properties": { - "action-names": [ - "resource-assignment-action" - ] - }, - "type": "artifact-config-template" - } - } - }, - "node_types": { - }, - "data_types": { - } -} \ No newline at end of file diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json deleted file mode 100644 index 6937c719..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json +++ /dev/null @@ -1,327 +0,0 @@ -{ - "metadata" : { - "template_author" : "Brinda Santh", - "template_name" : "enhance-template", - "template_version" : "1.0.0", - "template_tags" : "brinda, VPE", - "service-type" : "Sample Service", - "release" : "1806", - "vnf-type" : "VPE" - }, - "tosca_definitions_version" : "controller_blueprint_1_0_0", - "artifact_types" : { }, - "data_types" : { - }, - "node_types" : { - }, - "topology_template" : { - "inputs" : { - "request-id" : { - "required" : true, - "type" : "string" - }, - "service-instance-id" : { - "required" : true, - "type" : "string" - }, - "scope-type" : { - "required" : true, - "type" : "string" - }, - "action-name" : { - "required" : true, - "type" : "string" - }, - "hostname" : { - "required" : true, - "type" : "string" - }, - "resource-assignment-request" : { - "description" : "This is Dynamic Data type for the receipe resource-assignment-action.", - "required" : false, - "type" : "dt-resource-assignment-request" - } - }, - "node_templates" : { - "vpe-netconf-device" : { - "type" : "vnf-netconf-device", - "capabilities" : { - "netconf" : { - "properties" : { - "login-key" : "sdnc", - "login-account" : "sndc-local", - "source" : "local", - "target-ip-address" : { - "get_attribute" : [ "SELF", "lo0-local-ipv4-address" ] - }, - "port-number" : 22, - "connection-time-out" : 30 - } - } - } - }, - "activate-netconf-component" : { - "type" : "component-netconf-executor", - "capabilities" : { - "component-node" : { } - }, - "requirements" : { - "netconf-connection" : { - "capability" : "netconf", - "node" : "vpe-netconf-device", - "relationship" : "tosca.relationships.ConnectsTo" - } - }, - "interfaces" : { - "NetconfExecutorComponent" : { - "operations" : { - "process" : { - "implementation" : { - "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py" - }, - "inputs" : { - "action-name" : { - "get_input" : "action-name" - }, - "template-name" : { - "get_input" : "template_name" - }, - "template-version" : { - "get_input" : "template_version" - }, - "resource-type" : "vnf-type", - "request-id" : { - "get_input" : "request-id" - }, - "resource-id" : { - "get_input" : "hostname" - }, - "execution-script" : "execution-script" - }, - "outputs" : { - "response-data" : { - "get_attribute" : [ "SELF", "netconf-executor-baseconfig.response-data" ] - }, - "status" : { - "get_attribute" : [ "SELF", "netconf-executor-baseconfig.status" ] - } - } - } - } - } - } - }, - "resource-assignment-ra-component" : { - "type" : "component-resource-assignment", - "capabilities" : { - "component-node" : { } - }, - "interfaces" : { - "ResourceAssignmentComponent" : { - "operations" : { - "process" : { - "inputs" : { - "template-names" : [ "base-config-template", "licence-template" ], - "action-name" : { - "get_input" : "action-name" - }, - "template-name" : { - "get_input" : "template_name" - }, - "template-version" : { - "get_input" : "template-version" - }, - "resource-type" : "vnf-type", - "request-id" : { - "get_input" : "request-id" - }, - "resource-id" : { - "get_input" : "hostname" - } - }, - "outputs" : { - "resource-assignment-params" : "success", - "status" : "status" - } - } - } - } - } - }, - "resource-assignment-action" : { - "type" : "dg-resource-assignment", - "properties" : { - "mode" : "sync", - "version" : "LATEST", - "is-start-flow" : false - }, - "capabilities" : { - "dg-node" : { } - }, - "requirements" : { - "component-dependency" : { - "capability" : "component-node", - "node" : "resource-assignment-ra-component", - "relationship" : "tosca.relationships.DependsOn" - } - }, - "interfaces" : { - "CONFIG" : { - "operations" : { - "ResourceAssignment" : { - "inputs" : { - "params" : [ ] - } - } - } - } - } - }, - "activate-action" : { - "type" : "dg-activate-netconf", - "properties" : { - "mode" : "sync", - "version" : "LATEST", - "is-start-flow" : false - }, - "capabilities" : { - "dg-node" : { } - }, - "requirements" : { - "component-dependency" : { - "capability" : "component-node", - "node" : "activate-netconf-component", - "relationship" : "tosca.relationships.DependsOn" - } - }, - "interfaces" : { - "CONFIG" : { - "operations" : { - "ActivateNetconf" : { - "inputs" : { - "params" : [ ] - } - } - } - } - } - }, - "base-config-template" : { - "type" : "artifact-config-template", - "properties" : { - "action-names" : [ "resource-assignment-action" ] - }, - "capabilities" : { - "content" : { - "properties" : { - "content" : "db://base-config-template" - } - }, - "mapping" : { - "properties" : { - "mapping" : [ { - "name" : "rs-db-source", - "property" : { - "required" : true, - "type" : "string" - }, - "input-param" : false, - "dictionary-name" : "sample-db-source", - "dictionary-source" : "primary-db", - "dependencies" : [ "hostname" ], - "version" : 0 - }, { - "name" : "mdsal-source", - "property" : { - "description" : "", - "required" : true, - "type" : "list", - "entry_schema" : { - "type" : "dt-v4-aggregate" - } - }, - "input-param" : false, - "dictionary-name" : "sample-mdsal-source", - "dictionary-source" : "primary-config-data", - "dependencies" : [ "service-instance-id" ], - "version" : 0 - }, { - "name" : "hostname", - "property" : { - "required" : true, - "type" : "string" - }, - "dictionary-name" : "hostname", - "dictionary-source" : "input", - "version" : 0, - "input-param" : false - }, { - "name" : "service", - "property" : { - "required" : true, - "type" : "string" - }, - "dictionary-name" : "service", - "dictionary-source" : "input", - "version" : 0, - "input-param" : false - }, { - "name" : "service-instance-id", - "property" : { - "required" : true, - "type" : "string" - }, - "dictionary-name" : "service-instance-id", - "dictionary-source" : "input", - "version" : 0, - "input-param" : false - } ] - } - } - } - }, - "licence-template" : { - "type" : "artifact-config-template", - "properties" : { - "action-names" : [ "resource-assignment-action" ] - }, - "capabilities" : { - "content" : { - "properties" : { - "content" : "db://licence-template" - } - }, - "mapping" : { - "properties" : { - "mapping" : [ { - "name" : "licenses", - "property" : { - "required" : true, - "type" : "list", - "entry_schema" : { - "type" : "dt-license-key" - } - }, - "input-param" : false, - "dictionary-name" : "sample-licenses", - "dictionary-source" : "primary-config-data", - "dependencies" : [ "service-instance-id" ], - "version" : 0 - }, { - "name" : "service-instance-id", - "property" : { - "required" : true, - "type" : "string" - }, - "dictionary-name" : "service-instance-id", - "dictionary-source" : "input", - "version" : 0, - "input-param" : false - } ] - } - } - } - } - } - } -} \ No newline at end of file diff --git a/ms/controllerblueprints/modules/service/src/test/resources/logback.xml b/ms/controllerblueprints/modules/service/src/test/resources/logback.xml deleted file mode 100644 index 2546a838..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/logback.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - ${localPattern} - - - - - - - - - - - - - - diff --git a/ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json b/ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json deleted file mode 100644 index 5584b10e..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/model_type/data_type/datatype-property.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0", - "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs", - "properties": { - "type": { - "required": true, - "type": "string" - }, - "description": { - "required": false, - "type": "string" - }, - "required": { - "required": false, - "type": "boolean" - }, - "default": { - "required": false, - "type": "string" - }, - "entry_schema": { - "required": false, - "type": "string" - } - }, - "derived_from": "tosca.datatypes.Root" -} \ No newline at end of file diff --git a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json b/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json deleted file mode 100644 index c6dd7948..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/automap.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "name": "sample-input-source" - }, - { - "name": "sample-default-source" - }, - { - "name": "sample-db-source" - }, - { - "name": "sample-mdsal-source" - } -] \ No newline at end of file diff --git a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json b/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json deleted file mode 100644 index 334fb24e..00000000 --- a/ms/controllerblueprints/modules/service/src/test/resources/resourcedictionary/default_definition.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "ipaddress", - "property": { - "description": "name of the ", - "type": "list", - "entry_schema": { - "type": "dt-v4-aggregate" - } - }, - "updated-by": "Brinda Santh (bs2796)", - "tags": "ipaddress", - "sources": { - "input": { - "type": "source-input" - } - } -} \ No newline at end of file -- cgit 1.2.3-korg