diff options
author | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-03-25 13:04:18 -0400 |
---|---|---|
committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-03-25 13:41:44 -0400 |
commit | c90edac236dffb7c495e266dd04991de7e8f04b7 (patch) | |
tree | 103bb4d0870101ff61442f6b0fe291d1ad53b950 /components/model-catalog | |
parent | ffb6bdfd6de2afa23d95d0884c9db4059982deed (diff) |
Migrate ccsdk/apps to ccsdk/cds
Issue-ID: CCSDK-1177
Issue-ID: CCSDK-1178
Change-Id: I0c02702fbec52211ca367abbba72aebecee8cbaa
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Diffstat (limited to 'components/model-catalog')
14 files changed, 38 insertions, 38 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts index f1da61407..a471349ef 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts @@ -14,12 +14,12 @@ * limitations under the License. */ -import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.processor.* -import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource -import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException -import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintScriptsService -import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment -import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive +import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.processor.* +import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintScriptsService +import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment +import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive open class ScriptResourceAssignmentProcessor : ResourceAssignmentProcessor() { diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts index 184c49335..d28880d2e 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/kotlin/ScriptComponent.cba.kts @@ -14,9 +14,9 @@ * limitations under the License. */ -import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive -import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate -import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode +import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive +import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintFunctionNode open class SampleKotlinComponent : BlueprintFunctionNode<String, String> { diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py index 94cd72a48..f146e8123 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Scripts/python/NetconfRpcExample.py @@ -16,7 +16,7 @@ import netconf_constant from common import ResolutionHelper from java.lang import Exception as JavaException from netconfclient import NetconfClient -from org.onap.ccsdk.apps.blueprintsprocessor.functions.netconf.executor import \ +from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \ NetconfComponentFunction diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts index f1da61407..a471349ef 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ResourceAssignmentProcessor.cba.kts @@ -14,12 +14,12 @@ * limitations under the License. */ -import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.processor.* -import org.onap.ccsdk.apps.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource -import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintProcessorException -import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BluePrintScriptsService -import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceAssignment -import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive +import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.processor.* +import org.onap.ccsdk.cds.blueprintsprocessor.functions.resource.resolution.CapabilityResourceSource +import org.onap.ccsdk.cds.controllerblueprints.core.BluePrintProcessorException +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BluePrintScriptsService +import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment +import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive open class ScriptResourceAssignmentProcessor : ResourceAssignmentProcessor() { diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ScriptComponent.cba.kts b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ScriptComponent.cba.kts index 184c49335..d28880d2e 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ScriptComponent.cba.kts +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/kotlin/ScriptComponent.cba.kts @@ -14,9 +14,9 @@ * limitations under the License. */ -import org.onap.ccsdk.apps.controllerblueprints.core.asJsonPrimitive -import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate -import org.onap.ccsdk.apps.controllerblueprints.core.interfaces.BlueprintFunctionNode +import org.onap.ccsdk.cds.controllerblueprints.core.asJsonPrimitive +import org.onap.ccsdk.cds.controllerblueprints.core.data.ServiceTemplate +import org.onap.ccsdk.cds.controllerblueprints.core.interfaces.BlueprintFunctionNode open class SampleKotlinComponent : BlueprintFunctionNode<String, String> { diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py index e2f5655a2..5038caa77 100755 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Scripts/python/DefaultGetNetConfig.py @@ -2,7 +2,7 @@ import netconf_constant from netconfclient import NetconfClient from java.lang import Exception from abstract_blueprint_function import AbstractPythonComponentFunction -from org.onap.ccsdk.apps.blueprintsprocessor.functions.netconf.executor import NetconfRpcService +from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import NetconfRpcService diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py index 33f9400eb..518666a76 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py @@ -17,7 +17,7 @@ # ============LICENSE_END========================================================= from time import sleep -from org.onap.ccsdk.apps.blueprintsprocessor.functions.restconf.executor import \ +from org.onap.ccsdk.cds.blueprintsprocessor.functions.restconf.executor import \ RestconfComponentFunction from java.lang import Exception as JavaException diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py index 2d22f8bba..7663a875e 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py +++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/NetconfRpcExample.py @@ -16,7 +16,7 @@ import netconf_constant from common import ResolutionHelper from java.lang import Exception as JavaException from netconfclient import NetconfClient -from org.onap.ccsdk.apps.blueprintsprocessor.functions.netconf.executor import \ +from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \ NetconfComponentFunction diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py index deec47007..a2bef328e 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py +++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Scripts/python/Rollback.py @@ -16,7 +16,7 @@ import netconf_constant from common import ResolutionHelper from java.lang import Exception as JavaException from netconfclient import NetconfClient -from org.onap.ccsdk.apps.blueprintsprocessor.functions.netconf.executor import \ +from org.onap.ccsdk.cds.blueprintsprocessor.functions.netconf.executor import \ NetconfComponentFunction diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json b/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json index ba142600f..263882ad7 100644 --- a/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json +++ b/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json @@ -54,7 +54,7 @@ "type": "string"
},
"mask-info": {
- "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.apps.controllerblueprints.core.data.custom.MaskInfo ",
+ "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.cds.controllerblueprints.core.data.custom.MaskInfo ",
"required": false,
"type": "string"
},
diff --git a/components/model-catalog/proto-definition/pom.xml b/components/model-catalog/proto-definition/pom.xml index d12470843..0b40b3459 100644 --- a/components/model-catalog/proto-definition/pom.xml +++ b/components/model-catalog/proto-definition/pom.xml @@ -18,13 +18,13 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.apps</groupId> - <artifactId>ccsdk-apps</artifactId> + <groupId>org.onap.ccsdk.cds</groupId> + <artifactId>parent</artifactId> <version>0.4.2-SNAPSHOT</version> <relativePath>../../../</relativePath> </parent> - <groupId>org.onap.ccsdk.apps.components</groupId> + <groupId>org.onap.ccsdk.cds.components</groupId> <artifactId>proto-definition</artifactId> <packaging>jar</packaging> diff --git a/components/model-catalog/proto-definition/proto/BluePrintCommon.proto b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto index de92bdc1c..5d1efbdd4 100644 --- a/components/model-catalog/proto-definition/proto/BluePrintCommon.proto +++ b/components/model-catalog/proto-definition/proto/BluePrintCommon.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option java_multiple_files = true; -package org.onap.ccsdk.apps.controllerblueprints.common.api; +package org.onap.ccsdk.cds.controllerblueprints.common.api; message CommonHeader { string timestamp = 1; diff --git a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto index 658cbbbdc..4062a8cc8 100644 --- a/components/model-catalog/proto-definition/proto/BluePrintManagement.proto +++ b/components/model-catalog/proto-definition/proto/BluePrintManagement.proto @@ -1,18 +1,18 @@ syntax = "proto3"; import "BluePrintCommon.proto"; option java_multiple_files = true; -package org.onap.ccsdk.apps.controllerblueprints.management.api; +package org.onap.ccsdk.cds.controllerblueprints.management.api; message BluePrintManagementInput { - org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; string blueprintName = 2; string blueprintVersion = 3; FileChunk fileChunk = 4; } message BluePrintManagementOutput { - org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.apps.controllerblueprints.common.api.Status status = 3; + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; } message FileChunk { diff --git a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto index 5b91f46b7..9622287ab 100644 --- a/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto +++ b/components/model-catalog/proto-definition/proto/BluePrintProcessing.proto @@ -2,19 +2,19 @@ syntax = "proto3"; import "google/protobuf/struct.proto"; import "BluePrintCommon.proto"; option java_multiple_files = true; -package org.onap.ccsdk.apps.controllerblueprints.processing.api; +package org.onap.ccsdk.cds.controllerblueprints.processing.api; message ExecutionServiceInput { - org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.apps.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; google.protobuf.Struct payload = 3; } message ExecutionServiceOutput { - org.onap.ccsdk.apps.controllerblueprints.common.api.CommonHeader commonHeader = 1; - org.onap.ccsdk.apps.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; - org.onap.ccsdk.apps.controllerblueprints.common.api.Status status = 3; + org.onap.ccsdk.cds.controllerblueprints.common.api.CommonHeader commonHeader = 1; + org.onap.ccsdk.cds.controllerblueprints.common.api.ActionIdentifiers actionIdentifiers = 2; + org.onap.ccsdk.cds.controllerblueprints.common.api.Status status = 3; google.protobuf.Struct payload = 4; } |