diff options
author | Eliezio Oliveira <eliezio.oliveira@est.tech> | 2019-07-31 11:50:26 +0100 |
---|---|---|
committer | Dan Timoney <dtimoney@att.com> | 2019-08-09 19:46:17 +0000 |
commit | 1e7e4a53684df04ba248c20d884ba907ca7c2870 (patch) | |
tree | d75f0c3b55ada932c42cff18ba120e3c337c37f4 /components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions | |
parent | 1596f69d2e59a158ae509e798448a398b2c9559f (diff) |
Add declarative acceptance tests
First two UATs are for blueprints Echo and "PNF Configuration".
The body of the ODL mount request was changed from XML to JSON,
so it can be represented in a YAML file.
Initial documentation about the UATs can be found at
components/model-catalog/blueprint-model/uat-blueprints/README.md
BluePrintArchiveUtils.recurseFiles() replaced by compressFolder() that
uses native Java 7. Removed commons-compress as dependency since is no
longer used.
Change-Id: I96a584ae12ca009f90fe8fe9485eb57ce05e8add
Issue-ID: CCSDK-1569
Signed-off-by: Eliezio Oliveira <eliezio.oliveira@est.tech>
Diffstat (limited to 'components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions')
9 files changed, 0 insertions, 472 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json deleted file mode 100644 index d185128d5..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "tosca_definitions_version" : "controller_blueprint_1_0_0", - "metadata" : { - "template_author" : "Rodrigo Ottero", - "author-email" : "rodrigo.ottero@est.tech", - "user-groups" : "ADMIN, OPERATION", - "template_name" : "configuration_over_restconf", - "template_version" : "1.0.0", - "template_tags" : "pnf, restconf, config, configuration" - }, - "imports" : [ { - "file" : "Definitions/data_types.json" - }, { - "file" : "Definitions/relationship_types.json" - }, { - "file" : "Definitions/artifact_types.json" - }, { - "file" : "Definitions/node_types.json" - }, { - "file" : "Definitions/policy_types.json" - } ], - "dsl_definitions" : { - "config-deploy-properties" : { - "resolution-key" : { - "get_input" : "resolution-key" - } - } - }, - "topology_template" : { - "workflows" : { - "config-assign" : { - "steps" : { - "activate-process" : { - "description" : "Create a configlet", - "target" : "config-assign-process", - "activities" : [ { - "call_operation" : "" - } ] - } - }, - "inputs" : { - "resolution-key" : { - "required" : true, - "type" : "string" - }, - "store-result" : { - "required" : true, - "type" : "boolean" - }, - "config-assign-properties" : { - "description" : "Dynamic PropertyDefinition for workflow(config-assign).", - "required" : true, - "type" : "dt-config-assign-properties" - } - } - }, - "config-deploy" : { - "steps" : { - "activate-process" : { - "description" : "Send a configlet to the pnf", - "target" : "config-deploy-process", - "activities" : [ { - "call_operation" : "" - } ] - } - }, - "inputs" : { - "resolution-key" : { - "required" : true, - "type" : "string" - }, - "config-deploy-properties" : { - "description" : "Dynamic PropertyDefinition for workflow(config-deploy).", - "required" : true, - "type" : "dt-config-deploy-properties" - } - } - } - }, - "node_templates" : { - "config-assign-process" : { - "type" : "dg-generic", - "properties" : { - "content" : { - "get_artifact" : [ "SELF", "dg-config-assign-process" ] - }, - "dependency-node-templates" : [ "config-assign" ] - }, - "artifacts" : { - "dg-config-assign-process" : { - "type" : "artifact-directed-graph", - "file" : "Plans/CONFIG_configAssign.xml" - } - } - }, - "config-assign" : { - "type" : "component-resource-resolution", - "interfaces" : { - "ResourceResolutionComponent" : { - "operations" : { - "process" : { - "inputs" : { - "resolution-key" : { - "get_input" : "resolution-key" - }, - "store-result" : true, - "artifact-prefix-names" : ["config-assign"] - }, - "outputs" : { - "resource-assignment-params" : { - "get_attribute" : [ "SELF", "assignment-params" ] - }, - "status" : "success" - } - } - } - } - }, - "artifacts" : { - "config-assign-template" : { - "type" : "artifact-template-velocity", - "file" : "Templates/config-assign-restconf-configlet-template.vtl" - }, - "config-assign-mapping" : { - "type" : "artifact-mapping-resource", - "file" : "Definitions/config-assign-pnf-mapping.json" - } - } - }, - "config-deploy-process" : { - "type" : "dg-generic", - "properties" : { - "content" : { - "get_artifact" : [ "SELF", "dg-config-deploy-process" ] - }, - "dependency-node-templates" : [ "config-deploy" ] - }, - "artifacts" : { - "dg-config-assign-process" : { - "type" : "artifact-directed-graph", - "file" : "Plans/CONFIG_configDeploy.xml" - } - } - }, - "config-deploy" : { - "type" : "component-script-executor", - "interfaces" : { - "ComponentScriptExecutor" : { - "operations" : { - "process" : { - "implementation" : { - "primary" : "component-script" - }, - "inputs" : { - "script-type" : "jython", - "script-class-reference" : "Scripts/python/RestconfConfigDeploy.py", - "dynamic-properties" : "*config-deploy-properties" - }, - "outputs" : { - "response-data" : "", - "status" : "success" - } - } - } - } - }, - "artifacts" : { - "config-deploy-template" : { - "type" : "artifact-template-velocity", - "file" : "Templates/config-deploy-restconf-mount-template.vtl" - }, - "config-deploy-mapping" : { - "type" : "artifact-mapping-resource", - "file" : "Definitions/config-deploy-pnf-mapping.json" - }, - "component-script" : { - "type" : "artifact-script-jython", - "file" : "Scripts/python/RestconfConfigDeploy.py" - } - } - } - } - } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/artifact_types.json deleted file mode 100644 index aa5295e44..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/artifact_types.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "artifact_types" : { - "artifact-directed-graph" : { - "description" : "Directed Graph File", - "version" : "1.0.0", - "derived_from" : "tosca.artifacts.Implementation", - "file_ext" : [ "json", "xml" ] - }, - "artifact-mapping-resource" : { - "description" : "Resource Mapping File used along with Configuration template", - "version" : "1.0.0", - "derived_from" : "tosca.artifacts.Implementation", - "file_ext" : [ "json" ] - }, - "artifact-script-jython" : { - "description" : "Jython Script File", - "version" : "1.0.0", - "derived_from" : "tosca.artifacts.Implementation", - "file_ext" : [ "py" ] - }, - "artifact-template-velocity" : { - "description" : " Velocity Template used for Configuration", - "version" : "1.0.0", - "derived_from" : "tosca.artifacts.Implementation", - "file_ext" : [ "vtl" ] - } - } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json deleted file mode 100644 index fe51488c7..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json +++ /dev/null @@ -1 +0,0 @@ -[] diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json deleted file mode 100644 index d87b8d1f1..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "name": "pnf-id", - "input-param": true, - "property": { - "type": "string" - }, - "dictionary-name": "pnf-id", - "dictionary-source": "input", - "dependencies": [ - ] - }, - { - "name": "pnf-ipv4-address", - "input-param": true, - "property": { - "type": "string" - }, - "dictionary-name": "pnf-ipv4-address", - "dictionary-source": "input", - "dependencies": [ - ] - } -] diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json deleted file mode 100644 index a0804bb3f..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "data_types" : { - "dt-config-assign-properties" : { - "description" : "Dynamic DataType definition for workflow(config-assign).", - "version" : "1.0.0", - "properties" : { }, - "derived_from" : "tosca.datatypes.Dynamic" - }, - "dt-config-deploy-properties" : { - "description" : "Dynamic DataType definition for workflow(config-deploy).", - "version" : "1.0.0", - "properties" : { - "pnf-ipv4-address" : { - "type" : "string" - }, - "pnf-id" : { - "type" : "string" - } - }, - "derived_from" : "tosca.datatypes.Dynamic" - } - } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json deleted file mode 100644 index 8c2c0abea..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json +++ /dev/null @@ -1,174 +0,0 @@ -{ - "node_types" : { - "component-resource-resolution" : { - "description" : "This is Resource Assignment Component API", - "version" : "1.0.0", - "attributes" : { - "assignment-params" : { - "required" : true, - "type" : "string" - } - }, - "capabilities" : { - "component-node" : { - "type" : "tosca.capabilities.Node" - } - }, - "interfaces" : { - "ResourceResolutionComponent" : { - "operations" : { - "process" : { - "inputs" : { - "resolution-key" : { - "description" : "Key for service instance related correlation.", - "required" : false, - "type" : "string" - }, - "store-result" : { - "description" : "Whether or not to store the output.", - "required" : false, - "type" : "boolean" - }, - "resource-type" : { - "description" : "Request type.", - "required" : false, - "type" : "string" - }, - "artifact-prefix-names" : { - "description" : "Template , Resource Assignment Artifact Prefix names", - "required" : true, - "type" : "list", - "entry_schema" : { - "type" : "string" - } - }, - "request-id" : { - "description" : "Request Id, Unique Id for the request.", - "required" : true, - "type" : "string" - }, - "resource-id" : { - "description" : "Resource Id.", - "required" : false, - "type" : "string" - }, - "action-name" : { - "description" : "Action Name of the process", - "required" : false, - "type" : "string" - }, - "dynamic-properties" : { - "description" : "Dynamic Json Content or DSL Json reference.", - "required" : false, - "type" : "json" - } - }, - "outputs" : { - "resource-assignment-params" : { - "required" : true, - "type" : "string" - }, - "status" : { - "required" : true, - "type" : "string" - } - } - } - } - } - }, - "derived_from" : "tosca.nodes.Component" - }, - "component-script-executor" : { - "description" : "This is Restconf Transaction Configuration Component API", - "version" : "1.0.0", - "capabilities" : { - "component-node" : { - "type" : "tosca.capabilities.Node" - } - }, - "interfaces" : { - "ComponentScriptExecutor" : { - "operations" : { - "process" : { - "inputs" : { - "script-type" : { - "description" : "Script type, kotlin type is supported", - "required" : true, - "type" : "string", - "constraints" : [ { - "valid_values" : [ "kotlin", "jython", "internal" ] - } ], - "default" : "internal" - }, - "script-class-reference" : { - "description" : "Kotlin Script class name or jython script name.", - "required" : true, - "type" : "string" - }, - "dynamic-properties" : { - "description" : "Dynamic Json Content or DSL Json reference.", - "required" : false, - "type" : "json" - } - }, - "outputs" : { - "response-data" : { - "description" : "Execution Response Data in JSON format.", - "required" : false, - "type" : "string" - }, - "status" : { - "description" : "Status of the Component Execution ( success or failure )", - "required" : true, - "type" : "string" - } - } - } - } - } - }, - "derived_from" : "tosca.nodes.Component" - }, - "dg-generic" : { - "description" : "This is Generic Directed Graph Type", - "version" : "1.0.0", - "properties" : { - "content" : { - "required" : true, - "type" : "string" - }, - "dependency-node-templates" : { - "description" : "Dependent Step Components NodeTemplate name.", - "required" : true, - "type" : "list", - "entry_schema" : { - "type" : "string" - } - } - }, - "derived_from" : "tosca.nodes.Workflow" - }, - "source-input" : { - "description" : "This is Input Resource Source Node Type", - "version" : "1.0.0", - "properties" : { }, - "derived_from" : "tosca.nodes.ResourceSource" - }, - "tosca.nodes.Component" : { - "description" : "This is default Component Node", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" - }, - "tosca.nodes.ResourceSource" : { - "description" : "TOSCA base type for Resource Sources", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" - }, - "tosca.nodes.Workflow" : { - "description" : "This is Directed Graph Node Type", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" - } - } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/policy_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/policy_types.json deleted file mode 100644 index 1e44cc70a..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/policy_types.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "policy_types" : { } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/relationship_types.json deleted file mode 100644 index 4ddd7a57c..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/relationship_types.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "relationship_types" : { } -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json deleted file mode 100644 index 114eb1992..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "pnf-id" : { - "tags" : "pnf-id", - "name" : "pnf-id", - "property" : { - "description" : "pnf-id", - "type" : "string" - }, - "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>", - "sources" : { - "input" : { - "type" : "source-input", - "properties" : { } - } - } - }, - "pnf-ipv4-address" : { - "tags" : "pnf-ipv4-address", - "name" : "pnf-ipv4-address", - "property" : { - "description" : "pnf-ipv4-address", - "type" : "string" - }, - "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>", - "sources" : { - "input" : { - "type" : "source-input", - "properties" : { } - } - } - } -}
\ No newline at end of file |