Do not duplicate model types and data dictionaries 72/94772/4
authorAlexis de Talhouët <adetalhouet89@gmail.com>
Mon, 2 Sep 2019 19:22:48 +0000 (15:22 -0400)
committerAlexis de Talhouët <adetalhouet89@gmail.com>
Tue, 3 Sep 2019 13:04:52 +0000 (13:04 +0000)
Change-Id: I960e9ce040490dea82bd9afa9133ed982fe08d14
Issue-ID: CCSDK-1663
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
77 files changed:
components/model-catalog/resource-dictionary/starter-dictionary/db-source.json [moved from ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/processor-db-source.json with 94% similarity]
ms/blueprintsprocessor/application/opt/app/onap/config/application.properties [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-jinja.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json [deleted file]
ms/controllerblueprints/modules/blueprint-core/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintRepoFileServiceTest.kt
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-processor-db.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json [deleted file]
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java

diff --git a/ms/blueprintsprocessor/application/opt/app/onap/config/application.properties b/ms/blueprintsprocessor/application/opt/app/onap/config/application.properties
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-bpmn-camunda.json
deleted file mode 100644 (file)
index cae06c1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": " Camunda BPM File",
-  "version": "1.0.0",
-  "file_ext": [
-    "bpmn"
-  ],
-  "derived_from": "tosca.artifacts.Implementation"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-directed-graph.json
deleted file mode 100644 (file)
index 10bf7d2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "description": "Directed Graph File",
-  "version": "1.0.0",
-  "file_ext": [
-    "json",
-    "xml"
-  ],
-  "derived_from": "tosca.artifacts.Implementation"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-mapping-resource.json
deleted file mode 100644 (file)
index f505628..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": " Velocity and jinja Templates Resource Mapping File used along with Configuration template",
-  "version": "1.0.0",
-  "file_ext": [
-    "json"
-  ],
-  "derived_from": "tosca.artifacts.Implementation"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-script-python.json
deleted file mode 100644 (file)
index 22af3b0..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": " Kotlin Script Template used for Configuration",
-  "version": "1.0.0",
-  "file_ext": [
-    "py"
-  ],
-  "derived_from": "tosca.artifacts.Implementation"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-jinja.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-jinja.json
deleted file mode 100644 (file)
index e32da5e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": "Jinja Template used for Configuration",
-  "version": "1.0.0",
-  "file_ext": [
-    "jinja"
-  ],
-  "derived_from": "tosca.artifacts.Implementation"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/artifact-template-velocity.json
deleted file mode 100644 (file)
index 20f94c9..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "description": " Velocity Template used for Configuration",
-  "version": "1.0.0",
-  "file_ext": [
-    "vtl"
-  ],
-  "derived_from": "tosca.artifacts.Implementation"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/artifact_type/tosca.artifacts.Implementation.json
deleted file mode 100644 (file)
index d75f337..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "TOSCA base type for implementation artifacts",
-  "version": "1.0.0",
-  "derived_from": "tosca.artifacts.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-property.json
deleted file mode 100644 (file)
index d3ecffd..0000000
+++ /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/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/datatype-resource-assignment.json
deleted file mode 100644 (file)
index 8fa595a..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-       "version": "1.0.0",
-       "description": "This is Resource Assignment Data Type",
-       "properties": {
-               "property": {
-                       "required": true,
-                       "type": "datatype-property"
-               },
-               "input-param": {
-                       "required": true,
-                       "type": "boolean"
-               },
-               "dictionary-name": {
-                       "required": false,
-                       "type": "string"
-               },
-               "dictionary-source": {
-                       "required": false,
-                       "type": "string"
-               },
-               "dependencies": {
-                       "required": true,
-                       "type": "list",
-                       "entry_schema": {
-                               "type": "string"
-                       }
-               },
-               "status": {
-                       "required": false,
-                       "type": "string"
-               },
-               "message": {
-                       "required": false,
-                       "type": "string"
-               },
-               "updated-date": {
-                       "required": false,
-                       "type": "string"
-               },
-               "updated-by": {
-                       "required": false,
-                       "type": "string"
-               }
-       },
-       "derived_from": "tosca.datatypes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-license-key.json
deleted file mode 100644 (file)
index 27e25fe..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-       "version": "1.0.0",
-       "description": "This is dt-plicense-key Data Type",
-       "properties": {
-               "license-key": {
-                       "required": true,
-                       "type": "string"
-               }
-       },
-       "derived_from": "tosca.datatypes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/dt-v4-aggregate.json
deleted file mode 100644 (file)
index 4f7be2d..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-       "version": "1.0.0",
-       "description": "This is dt-v4-aggregate Data Type",
-       "properties": {
-               "ipv4-address": {
-                       "required": true,
-                       "type": "string"
-               },
-               "ipv4-plen": {
-                       "required": false,
-                       "type": "integer"
-               }
-       },
-       "derived_from": "tosca.datatypes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/data_type/tosca.datatypes.Credential.json
deleted file mode 100644 (file)
index 68d9165..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "version": "1.0.0",
-  "description": "Credential",
-  "properties": {
-    "protocol": {
-      "required": false,
-      "type": "string"
-    },
-    "token_type": {
-      "required": true,
-      "type": "string",
-      "default" : "password"
-    },
-    "token": {
-      "required": false,
-      "type": "string"
-    },
-    "keys": {
-      "required": false,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "user": {
-      "required": false,
-      "type": "string"
-    }
-  },
-  "derived_from": "tosca.datatypes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/artifact-config-template.json
deleted file mode 100644 (file)
index 1420661..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-       "description": "This is Configuration Velocity and Jinja Template",
-       "version": "1.0.0",
-       "properties": {
-               "action-names": {
-                       "required": true,
-                       "type": "list",
-                       "entry_schema": {
-                               "type": "string"
-                       }
-               }
-       },
-       "capabilities": {
-               "content": {
-                       "type": "tosca.capabilities.Content",
-                       "properties": {
-                               "content": {
-                                       "required": true,
-                                       "type": "string"
-                               }
-                       }
-               },
-               "mapping": {
-                       "type": "tosca.capabilities.Mapping",
-                       "properties": {
-                               "mapping": {
-                                       "required": false,
-                                       "type": "list",
-                                       "entry_schema": {
-                                               "type": "datatype-resource-assignment"
-                                       }
-                               }
-                       }
-               }
-       },
-       "derived_from": "tosca.nodes.Artifact"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-config-generator.json
deleted file mode 100644 (file)
index 3d90986..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-       "description": "This is Generate Configuration Component API",
-       "version": "1.0.0",
-       "capabilities": {
-               "component-node": {
-                       "type": "tosca.capabilities.Node"
-               }
-       },
-       "interfaces": {
-               "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {
-                       "operations": {
-                               "process": {
-                                       "inputs": {
-                                               "template-data": {
-                                                       "description": "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",
-                                                       "required": false,
-                                                       "type": "string"
-                                               },
-                                               "template-content": {
-                                                       "description": "Conditional : Dynamic Template used to generate Configuration.",
-                                                       "required": false,
-                                                       "type": "string"
-                                               },
-                                               "resource-type": {
-                                                       "description": "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",
-                                                       "required": false,
-                                                       "type": "string"
-                                               },
-                                               "request-id": {
-                                                       "description": "Request Id used to store the generated configuration, in the database along with the template-name",
-                                                       "required": true,
-                                                       "type": "string"
-                                               },
-                                               "resource-id": {
-                                                       "description": "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",
-                                                       "required": false,
-                                                       "type": "string"
-                                               },
-                                               "action-name": {
-                                                       "description": "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-                                                       "required": false,
-                                                       "type": "string"
-                                               },
-                                               "template-name": {
-                                                       "description": "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",
-                                                       "required": true,
-                                                       "type": "string"
-                                               }
-                                       },
-                                       "outputs": {
-                                               "generated-config": {
-                                                       "description": "Generated Configuration for the Template adn Resource Data",
-                                                       "required": true,
-                                                       "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.cds.controllerblueprints.core.data.custom.MaskInfo ",
-                                                       "required": false,
-                                                       "type": "string"
-                                               },
-                                               "status": {
-                                                       "description": "Status of the Component Execution ( success or failure )",
-                                                       "required": true,
-                                                       "type": "string"
-                                               }
-                                       }
-                               }
-                       }
-               }
-       },
-       "derived_from": "tosca.nodes.Component"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-netconf-executor.json
deleted file mode 100644 (file)
index 22f5c9b..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "description": "This is Netconf Transaction Configuration Component API",
-  "version": "1.0.0",
-  "capabilities": {
-    "component-node": {
-      "type": "tosca.capabilities.Node"
-    }
-  },
-  "requirements": {
-    "netconf-connection": {
-      "capability": "netconf",
-      "node": "vnf-netconf-device",
-      "relationship": "tosca.relationships.ConnectsTo"
-    }
-  },
-  "interfaces": {
-    "org-onap-ccsdk-netconf-adaptor-service-NetconfExecutorNode": {
-      "operations": {
-        "process": {
-          "inputs": {
-            "request-id": {
-              "description": "Request Id used to store the generated configuration, in the database along with the template-name",
-              "required": true,
-              "type": "string"
-            },
-            "service-template-name": {
-              "description": "Service Template Name",
-              "required": true,
-              "type": "string"
-            },
-            "service-template-version": {
-              "description": "Service Template Version",
-              "required": true,
-              "type": "string"
-            },
-            "action-name": {
-              "description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-              "required": false,
-              "type": "string"
-            },
-            "resource-type": {
-              "description": "Resource Type to get from Database, Either (message & mask-info ) or( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-              "required": false,
-              "type": "string"
-            },
-            "resource-id": {
-              "description": "Resource Id to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",
-              "required": false,
-              "type": "string"
-            },
-            "reservation-id": {
-                               "description": "Reservation Id used to send to NPM",
-                               "required": false,
-                               "type": "string"
-                       },
-            "execution-script": {
-              "description": "Python Script to Execute for this Component action, It should refer any one of Prython Artifact Definition for this Node Template.",
-              "required": true,
-              "type": "string"
-            }
-          },
-          "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"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/component-resource-assignment.json
deleted file mode 100644 (file)
index e009f85..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "description": "This is Resource Assignment Component API",
-  "version": "1.0.0",
-  "capabilities": {
-    "component-node": {
-      "type": "tosca.capabilities.Node"
-    }
-  },
-  "interfaces": {
-    "ResourceAssignmentComponent": {
-      "operations": {
-        "process": {
-          "inputs": {
-            "service-template-name": {
-              "description": "Service Template Name.",
-              "required": true,
-              "type": "string"
-            },
-            "service-template-version": {
-              "description": "Service Template Version.",
-              "required": true,
-              "type": "string"
-            },
-            "resource-type": {
-              "description": "Request type.",
-              "required": true,
-              "type": "string"
-            },
-            "template-names": {
-              "description": "Name of the artifact Node Templates, to get the template Content.",
-              "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": true,
-              "type": "string"
-            },
-            "action-name": {
-              "description": "Action Name of the process",
-              "required": true,
-              "type": "string"
-            }
-          },
-          "outputs": {
-            "resource-assignment-params": {
-              "required": true,
-              "type": "string"
-            },
-            "status": {
-              "required": true,
-              "type": "string"
-            }
-          }
-        }
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.Component"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json
deleted file mode 100644 (file)
index c17a36c..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-       "description": "This is Download Netconf Directed Graph",
-       "version": "1.0.0",
-       "properties": {
-               "mode": {
-                       "required": false,
-                       "type": "string",
-                       "default": "sync"
-               },
-               "version": {
-                       "required": false,
-                       "type": "string",
-                       "default": "LATEST"
-               },
-               "is-start-flow": {
-                       "required": false,
-                       "type": "boolean",
-                       "default": false
-               }
-       },
-       "capabilities": {
-               "dg-node": {
-                       "type": "tosca.capabilities.Node"
-               }
-       },
-       "requirements": {
-               "component-dependency": {
-                       "capability": "component-node",
-                       "node": "component-netconf-executor",
-                       "relationship": "tosca.relationships.DependsOn"
-               }
-       },
-       "interfaces": {
-               "CONFIG": {
-                       "operations": {
-                               "ActivateNetconf": {
-                                       "inputs": {
-                                               "params": {
-                                                       "required": false,
-                                                       "type": "list",
-                                                       "entry_schema": {
-                                                               "type": "datatype-property"
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       },
-       
-       "derived_from": "tosca.nodes.Workflow"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json
deleted file mode 100644 (file)
index 4d5343c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-       "description": "This is Activate DG for Config Generator Directed Graph",
-       "version": "1.0.0",
-       "properties": {
-               "mode": {
-                       "required": false,
-                       "type": "string",
-                       "default": "sync"
-               },
-               "version": {
-                       "required": false,
-                       "type": "string",
-                       "default": "LATEST"
-               },
-               "is-start-flow": {
-                       "required": false,
-                       "type": "boolean",
-                       "default": false
-               }
-       },
-       "capabilities": {
-               "dg-node": {
-                       "type": "tosca.capabilities.Node"
-               }
-       },
-       "requirements": {
-               "component-dependency": {
-                       "capability": "component-node",
-                       "node": "component-config-generator",
-                       "relationship": "tosca.relationships.DependsOn"
-               }
-       },
-       "interfaces": {
-               "CONFIG": {
-                       "operations": {
-                               "GenerateConfiguration": {
-                                       "inputs": {
-                                               "params": {
-                                                       "required": false,
-                                                       "type": "list",
-                                                       "entry_schema": {
-                                                               "type": "datatype-property"
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       },
-       "derived_from": "tosca.nodes.Workflow"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json
deleted file mode 100644 (file)
index f444864..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-       "description": "This is Resource Assign and Activate Netconf Directed Graph",
-       "version": "1.0.0",
-       "properties": {
-               "mode": {
-                       "required": false,
-                       "type": "string",
-                       "default": "sync"
-               },
-               "version": {
-                       "required": false,
-                       "type": "string",
-                       "default": "LATEST"
-               },
-               "is-start-flow": {
-                       "required": false,
-                       "type": "boolean",
-                       "default": false
-               }
-       },
-       "capabilities": {
-               "dg-node": {
-                       "type": "tosca.capabilities.Node"
-               }
-       },
-       "requirements": {
-               "ra-component": {
-                       "capability": "component-node",
-                       "node": "component-resource-assignment",
-                       "relationship": "tosca.relationships.DependsOn"
-               },
-               "netconf-component": {
-                       "capability": "component-node",
-                       "node": "component-netconf-executor",
-                       "relationship": "tosca.relationships.DependsOn"
-               }
-       },
-       "interfaces": {
-               "CONFIG": {
-                       "operations": {
-                               "ResourceAssignAndActivate": {
-                                       "inputs": {
-                                               "params": {
-                                                       "required": false,
-                                                       "type": "list",
-                                                       "entry_schema": {
-                                                               "type": "datatype-property"
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       },
-       "derived_from": "tosca.nodes.Workflow"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json
deleted file mode 100644 (file)
index d13668a..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-       "description": "This is Resource Assignment Directed Graph",
-       "version": "1.0.0",
-       "properties": {
-               "mode": {
-                       "required": false,
-                       "type": "string",
-                       "default": "sync"
-               },
-               "version": {
-                       "required": false,
-                       "type": "string",
-                       "default": "LATEST"
-               },
-               "is-start-flow": {
-                       "required": false,
-                       "type": "boolean",
-                       "default": false
-               }
-       },
-       "capabilities": {
-               "dg-node": {
-                       "type": "tosca.capabilities.Node"
-               }
-       },
-       "requirements": {
-               "component-dependency": {
-                       "capability": "component-node",
-                       "node": "component-resource-assignment",
-                       "relationship": "tosca.relationships.DependsOn"
-               }
-       },
-       "interfaces": {
-               "CONFIG": {
-                       "operations": {
-                               "ResourceAssignment": {
-                                       "inputs": {
-                                               "params": {
-                                                       "required": false,
-                                                       "type": "list",
-                                                       "entry_schema": {
-                                                               "type": "datatype-property"
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-       },
-       "derived_from": "tosca.nodes.Workflow"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Artifact.json
deleted file mode 100644 (file)
index 4db3f73..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "This is Deprecated Artifact Node Type.",
-  "version": "1.0.0",
-  "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Component.json
deleted file mode 100644 (file)
index d559216..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "This is default Component Node",
-  "version": "1.0.0",
-  "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.DG.json
deleted file mode 100644 (file)
index eb8cac0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "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/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.Vnf.json
deleted file mode 100644 (file)
index c2f5b86..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "This is VNF Node Type",
-  "version": "1.0.0",
-  "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/tosca.nodes.component.Python.json
deleted file mode 100644 (file)
index 908e568..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "This is Python Component",
-  "version": "1.0.0",
-  "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/vnf-netconf-device.json
deleted file mode 100644 (file)
index b226a0c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-       "description": "This is VNF Device with Netconf  Capability",
-       "version": "1.0.0",
-       "capabilities": {
-               "netconf": {
-                       "type": "tosca.capability.Netconf",
-                       "properties": {
-                               "login-key": {
-                                       "required": true,
-                                       "type": "string",
-                                       "default": "sdnc"
-                               },
-                               "login-account": {
-                                       "required": true,
-                                       "type": "string",
-                                       "default": "sdnc-tacacs"
-                               },
-                               "source": {
-                                       "required": true,
-                                       "type": "string",
-                                       "default": "npm"
-                               },
-                               "target-ip-address": {
-                                       "required": true,
-                                       "type": "string"
-                               },
-                               "port-number": {
-                                       "required": true,
-                                       "type": "integer",
-                                       "default": 830
-                               },
-                               "connection-time-out": {
-                                       "required": false,
-                                       "type": "integer",
-                                       "default": 30
-                               }
-                       }
-               }
-       },
-       "derived_from": "tosca.nodes.Vnf"
-       
-}
index ac4fc6a..47b4f21 100644 (file)
@@ -28,7 +28,7 @@ import kotlin.test.assertNotNull
  */
 class BluePrintRepoFileServiceTest {
 
-    private val basePath = "load/model_type"
+    private val basePath = "./../../../../components/model-catalog/definition-type/starter-type"
     private val bluePrintRepoFileService = BluePrintRepoFileService(basePath)
 
     @Test
@@ -39,7 +39,7 @@ class BluePrintRepoFileServiceTest {
 
     @Test
     fun testGetNodeType() {
-        val nodeType = bluePrintRepoFileService.getNodeType("component-resource-assignment")
+        val nodeType = bluePrintRepoFileService.getNodeType("component-resource-resolution")
         assertNotNull(nodeType, "Failed to get NodeType from repo")
     }
 
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-component-java.json
deleted file mode 100644 (file)
index 95a9801..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "description": "This is Custom Java Component Resource Source Node Type",
-  "version": "1.0.0",
-  "properties": {
-    "type": {
-      "required": false,
-      "type": "string",
-      "default" : "DYNAMIC",
-      "constraints": [
-        {
-          "validValues": [
-            "DYNAMIC"
-          ]
-        }
-      ]
-    },
-    "class-name": {
-      "required": true,
-      "type": "string",
-      "description" : "Fully Qualified Class Name ( <Package Name> + . + <Class Name> )"
-    },
-    "key-dependencies": {
-      "required": false,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.ResourceSource"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-default.json
deleted file mode 100644 (file)
index 13e234e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "description": "This is Default Resource Source Node Type",
-  "version": "1.0.0",
-  "properties": {
-    "key": {
-      "required": false,
-      "type": "string"
-    },
-    "key-dependencies": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.ResourceSource"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-input.json
deleted file mode 100644 (file)
index 126ea30..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "description": "This is Input Resource Source Node Type",
-  "version": "1.0.0",
-  "properties": {
-    "key": {
-      "required": false,
-      "type": "string"
-    },
-    "key-dependencies": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.ResourceSource"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-processor-db.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-processor-db.json
deleted file mode 100644 (file)
index 661a950..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "description": "This is Database Resource Source Node Type",
-  "version": "1.0.0",
-  "properties": {
-    "type": {
-      "required": true,
-      "type": "string",
-      "constraints": [
-        {
-          "valid_values": [
-            "SQL",
-            "PLSQL"
-          ]
-        }
-      ]
-    },
-    "query": {
-      "required": true,
-      "type": "string"
-    },
-    "input-key-mapping": {
-      "required": false,
-      "type": "map",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "output-key-mapping": {
-      "required": false,
-      "type": "map",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "key-dependencies": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.ResourceSource"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/source-rest.json
deleted file mode 100644 (file)
index f8dd8b6..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "description": "This is Rest Resource Source Node Type",
-  "version": "1.0.0",
-  "properties": {
-    "type": {
-      "required": false,
-      "type": "string",
-      "default": "JSON",
-      "constraints": [
-        {
-          "valid_values": [
-            "JSON"
-          ]
-        }
-      ]
-    },
-    "url-path": {
-      "required": true,
-      "type": "string"
-    },
-    "path": {
-      "required": true,
-      "type": "string"
-    },
-    "expression-type": {
-      "required": false,
-      "type": "string",
-      "default": "JSON_PATH",
-      "constraints": [
-        {
-          "valid_values": [
-            "JSON_PATH",
-            "JSON_POINTER"
-          ]
-        }
-      ]
-    },
-    "input-key-mapping": {
-      "required": false,
-      "type": "map",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "output-key-mapping": {
-      "required": false,
-      "type": "map",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "key-dependencies": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.ResourceSource"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json b/ms/controllerblueprints/modules/resource-dict/load/model_type/node_type/tosca.nodes.ResourceSource.json
deleted file mode 100644 (file)
index 2ef553e..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "TOSCA base type for Resource Sources",
-  "version": "1.0.0",
-  "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/address.json
deleted file mode 100644 (file)
index e999938..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "address",
-  "tags" : "address",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "address",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "address"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic-cloud-region.json
deleted file mode 100644 (file)
index 2528fc7..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "aic-cloud-region",
-  "tags" : "aic-cloud-region",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "aic-cloud-region",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "aic-cloud-region"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/aic_clli.json
deleted file mode 100644 (file)
index 9e5a6d5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "aic_clli",
-  "tags" : "aic_clli",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "aic_clli",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "aic_clli"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/availability_zone_0.json
deleted file mode 100644 (file)
index fc88ced..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "availability_zone_0",
-  "tags" : "availability_zone_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "availability_zone_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "availability_zone_0"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/default-source.json
deleted file mode 100644 (file)
index 42059ad..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "tags": "v4-ip-type, tosca.datatypes.Root, data_type, brindasanth@onap.com",
-  "name": "default-source",
-  "property" :{
-    "description": "name of the ",
-    "type": "string"
-  },
-  "updated-by": "brindasanth@onap.com",
-  "sources": {
-    "default": {
-      "type": "source-default",
-      "properties": {
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/input-source.json
deleted file mode 100644 (file)
index e876c53..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-       "name": "input-source",
-       "property" :{
-               "description": "name of the ",
-               "type": "string"
-       },
-       "updated-by": "brindasanth@onap.com",
-       "tags": null,
-       "sources": {
-               "input": {
-                       "type": "source-input",
-                       "properties": {
-                               "key": "action-name"
-                       }
-               }
-       }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
deleted file mode 100644 (file)
index 0bc8029..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "tags": "oam-local-ipv4-address",
-  "name": "mdsal-source",
-  "property" :{
-    "description": "based on service-instance-id,network-role,v4-ip-type and vm-type get the ipv4-gateway-prefix from the SDN-GC mdsal",
-    "type": "string"
-  },
-  "updated-by": "brindasanth@onap.com",
-  "sources": {
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/L3VNF-API:services/service-list/$service-instance-id/service-data/vnf-topology-information/vnf-assignments/vnf-vms/$vm-type/vm-networks/$network-role/v4-assigned-ip-list/$v4-ip-type",
-        "path": "/v4-assigned-ip-list/0/v4-ip-prefix",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "network-role": "network-role",
-          "v4-ip-type": "v4-ip-type",
-          "vm-type": "vm-type"
-        },
-        "output-key-mapping": {
-          "oam-local-ipv4-address": "v4-ip-prefix"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "network-role",
-          "v4-ip-type",
-          "vm-type"
-        ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/name_0.json
deleted file mode 100644 (file)
index 6be5bc1..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "name_0",
-  "tags" : "name_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "name_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "name_0"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
deleted file mode 100644 (file)
index 51c4596..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "nf-role",
-  "tags" : "nf-role",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf/nf-role",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
-        "input-key-mapping" : {
-          "vnfmodelcustomizationuuid" : "vnf-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "nf-role" : "vf_model_role"
-        },
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
deleted file mode 100644 (file)
index f2450be..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "nfc-naming-code",
-  "tags" : "nfc-naming-code",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "nfc-naming-code",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping" : {
-          "vfccustomizationuuid" : "vfccustomizationuuid"
-        },
-        "output-key-mapping" : {
-          "nfc-naming-code" : "nfc_naming_code"
-        },
-        "key-dependencies" : [ "vfccustomizationuuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
deleted file mode 100644 (file)
index 15648ad..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name" : "onap_private_net_cidr",
-  "tags" : "onap_private_net_cidr",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "onap_private_net_cidr",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = private",
-        "output-key-mapping" : {
-          "onap_private_net_cidr" : "prefix"
-        }
-         }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_id.json
deleted file mode 100644 (file)
index 75cc696..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "onap_private_net_id",
-  "tags" : "onap_private_net_id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "onap_private_net_id",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "onap_private_net_id"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
deleted file mode 100644 (file)
index 38e4ae1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name" : "private-prefix-id",
-  "tags" : "private-prefix-id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "private-prefix-id",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = private",
-        "output-key-mapping" : {
-          "private-prefix-id" : "prefix_id"
-        }
-         }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
deleted file mode 100644 (file)
index 1ddad09..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name" : "protected-prefix-id",
-  "tags" : "protected-prefix-id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "protected-prefix-id",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = protected",
-        "output-key-mapping" : {
-          "protected-prefix-id" : "prefix_id"
-        }      
-         }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
deleted file mode 100644 (file)
index badc948..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name" : "protected_private_net_cidr",
-  "tags" : "protected_private_net_cidr",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "protected_private_net_cidr",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = protected",
-        "output-key-mapping" : {
-          "protected_private_net_cidr" : "prefix"
-        }      
-         }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/public_net_id.json
deleted file mode 100644 (file)
index 17ad96b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "public_net_id",
-  "tags" : "public_net_id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "public_net_id",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "public_net_id"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/service-instance-id.json
deleted file mode 100644 (file)
index db089f0..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "service-instance-id",
-  "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "To be provided",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "service-instance-id"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
deleted file mode 100644 (file)
index 2e13567..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name" : "unprotected-prefix-id",
-  "tags" : "unprotected-prefix-id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "unprotected-prefix-id",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = unprotected",
-        "output-key-mapping" : {
-          "unprotected-prefix-id" : "prefix_id"
-        }      
-         }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
deleted file mode 100644 (file)
index acb379b..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name" : "unprotected_private_net_cidr",
-  "tags" : "unprotected_private_net_cidr",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "unprotected_private_net_cidr",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = unprotected",
-        "output-key-mapping" : {
-          "unprotected_private_net_cidr" : "prefix"
-        }      
-         }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-id.json
deleted file mode 100644 (file)
index 5203bb3..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vf-module-id",
-  "tags" : "vf-module-id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-module-id",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vf-module-id"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
deleted file mode 100644 (file)
index 95b78af..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vf-module-label",
-  "tags" : "vf-module-label",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-module-label",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
-        "input-key-mapping" : {
-          "customizationid" : "vf-module-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vf-module-label" : "vf_module_label"
-        },
-        "key-dependencies" : [ "vf-module-model-customization-uuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-model-customization-uuid.json
deleted file mode 100644 (file)
index dd47918..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vf-module-model-customization-uuid",
-  "tags" : "vf-module-model-customization-uuid",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-module-model-customization-uuid",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vf-module-model-customization-uuid"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
deleted file mode 100644 (file)
index 6aa6db1..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vf-module-type",
-  "tags" : "vf-module-type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-module-type",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
-        "input-key-mapping" : {
-          "customizationid" : "vf-module-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vf-module-type" : "vf_module_type"
-        },
-        "key-dependencies" : [ "vf-module-model-customization-uuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
deleted file mode 100644 (file)
index df00ba2..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vf-naming-policy",
-  "tags" : "vf-naming-policy",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-naming-policy",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
-        "input-key-mapping" : {
-          "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vf-naming-policy" : "vf_naming_policy"
-        },
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
deleted file mode 100644 (file)
index 1bf36ef..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vf-nf-code",
-  "tags" : "vf-nf-code",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf-nf-code",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
-        "input-key-mapping" : {
-          "customizationid" : "vnf-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vf-nf-code" : "vf_nf_code"
-        },
-        "key-dependencies" : [ "vnf-model-customization-uuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf_module_name.json
deleted file mode 100644 (file)
index 3d95891..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vf_module_name",
-  "tags" : "vf_module_name",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vf_module_name",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vf_module_name"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
deleted file mode 100644 (file)
index bf14f74..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vfccustomizationuuid",
-  "tags" : "vfccustomizationuuid, tosca.datatypes.Root, data_type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vfccustomizationuuid",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
-        "input-key-mapping" : {
-          "vfmodulecustomizationuuid" : "vf-module-model-customization-uuid"
-        },
-        "output-key-mapping" : {
-          "vfccustomizationuuid" : "vnf_customid"
-        },
-        "key-dependencies" : [ "vf-module-model-customization-uuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
deleted file mode 100644 (file)
index b54d8a4..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name" : "vfw_private_ip_0",
-  "tags" : "vfw_private_ip_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vfw_private_ip_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vfw_private_ip_0"
-      }
-    },
-    "sdnc" : {
-      "type" : "source-rest",
-      "properties" : {
-        "type" : "JSON",
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_0",
-        "path" : "/param/0/value",
-        "expression-type" : "JSON_POINTER",
-        "input-key-mapping" : {
-          "service-instance-id" : "service-instance-id",
-          "vnf-id" : "vnf-id",
-          "vf-module-id" : "vf-module-id"
-        },
-        "output-key-mapping" : {
-          "vfw_private_ip_0" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
deleted file mode 100644 (file)
index 04d6f58..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name" : "vfw_private_ip_1",
-  "tags" : "vfw_private_ip_1",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vfw_private_ip_1",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vfw_private_ip_1"
-      }
-    },
-    "sdnc" : {
-      "type" : "source-rest",
-      "properties" : {
-        "type" : "JSON",
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_1",
-        "path" : "/param/0/value",
-        "expression-type" : "JSON_POINTER",
-        "input-key-mapping" : {
-          "service-instance-id" : "service-instance-id",
-          "vnf-id" : "vnf-id",
-          "vf-module-id" : "vf-module-id"
-        },
-        "output-key-mapping" : {
-          "vfw_private_ip_1" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_2.json
deleted file mode 100644 (file)
index 9e51064..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vfw_private_ip_2",
-  "tags" : "vfw_private_ip_2",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vfw_private_ip_2",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vfw_private_ip_2"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
deleted file mode 100644 (file)
index d67ab1a..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vm-type",
-  "tags" : "vm-type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vm-type",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping" : {
-          "vfccustomizationuuid" : "vfccustomizationuuid"
-        },
-        "output-key-mapping" : {
-          "vm-type" : "vm_type"
-        },
-        "key-dependencies" : [ "vfccustomizationuuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-id.json
deleted file mode 100644 (file)
index 5ea0fbc..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vnf-id",
-  "tags" : "vnf-id",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf-id",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vnf-id"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-model-customization-uuid.json
deleted file mode 100644 (file)
index d36fe74..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vnf-model-customization-uuid",
-  "tags" : "vnf-model-customization-uuid",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf-model-customization-uuid",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vnf-model-customization-uuid"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
deleted file mode 100644 (file)
index bba92c8..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "name" : "vnf-name",
-  "tags" : "vnf-name, tosca.datatypes.Root, data_type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf-name",
-    "type" : "string"
-  },
-  "sources" : {
-    "sdnc": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-name/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-name": "vnf-name"
-        },
-        "output-key-mapping": {
-          "vnf-name": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-name"
-        ]
-      }
-    },
-    "aai-data": {
-      "type": "source-rest",
-      "properties": {
-        "type": "JSON",
-        "verb": "GET",
-        "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",
-        "path": "",
-        "input-key-mapping": {
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "vnf-name": "vnf-name"
-        },
-        "key-dependencies": [
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
deleted file mode 100644 (file)
index 99a6198..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name" : "vnf_name",
-  "tags" : "vnf_name",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnf_name",
-    "type" : "string"
-  },
-  "sources" : {
-    "sdnc" : {
-      "type" : "source-rest",
-      "properties" : {
-        "type" : "JSON",
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
-        "path" : "/param/0/value",
-        "expression-type" : "JSON_POINTER",
-        "input-key-mapping" : {
-          "service-instance-id" : "service-instance-id",
-          "vnf-id" : "vnf-id"
-        },
-        "output-key-mapping" : {
-          "vnf_name" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
deleted file mode 100644 (file)
index 022face..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vnfc-model-invariant-uuid",
-  "tags" : "vnfc-model-invariant-uuid",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnfc-model-invariant-uuid for vFW template",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select vfc_model.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping" : {
-          "vfccustomizationuuid" : "vfccustomizationuuid"
-        },
-        "output-key-mapping" : {
-          "vnfc-model-invariant-uuid" : "vfc_invariant_uuid"
-        },
-        "key-dependencies" : [ "vfccustomizationuuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
deleted file mode 100644 (file)
index 02c487c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name" : "vnfc-model-version",
-  "tags" : "vnfc-model-version",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnfc-model-version for vFW template",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-db",
-      "properties" : {
-        "type" : "SQL",
-        "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
-        "input-key-mapping" : {
-          "vfccustomizationuuid" : "vfccustomizationuuid"
-        },
-        "output-key-mapping" : {
-          "vnfc-model-version" : "vnfc_model_version"
-        },
-        "key-dependencies" : [ "vfccustomizationuuid" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
deleted file mode 100644 (file)
index 6e9b8dc..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name" : "vpg_private_ip_0",
-  "tags" : "vpg_private_ip_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vpg_private_ip_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vpg_private_ip_0"
-      }
-    },
-    "sdnc" : {
-      "type" : "source-rest",
-      "properties" : {
-        "type" : "JSON",
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vpg_private_ip_0",
-        "path" : "/param/0/value",
-        "expression-type" : "JSON_POINTER",
-        "input-key-mapping" : {
-          "service-instance-id" : "service-instance-id",
-          "vnf-id" : "vnf-id",
-          "vf-module-id" : "vf-module-id"
-        },
-        "output-key-mapping" : {
-          "vpg_private_ip_0" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_1.json
deleted file mode 100644 (file)
index 23c42e0..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vpg_private_ip_1",
-  "tags" : "vpg_private_ip_1",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vpg_private_ip_1",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vpg_private_ip_1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
deleted file mode 100644 (file)
index f86c95a..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "name" : "vsn_private_ip_0",
-  "tags" : "vsn_private_ip_0",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vsn_private_ip_0",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vsn_private_ip_0"
-      }
-    },
-    "sdnc" : {
-      "type" : "source-rest",
-      "properties" : {
-        "type" : "JSON",
-        "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vsn_private_ip_0",
-        "path" : "/param/0/value",
-        "expression-type" : "JSON_POINTER",
-        "input-key-mapping" : {
-          "service-instance-id" : "service-instance-id",
-          "vnf-id" : "vnf-id",
-          "vf-module-id" : "vf-module-id"
-        },
-        "output-key-mapping" : {
-          "vsn_private_ip_0" : "value"
-        },
-        "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ]
-      }
-    }
-  }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_1.json
deleted file mode 100644 (file)
index 88750b2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name" : "vsn_private_ip_1",
-  "tags" : "vsn_private_ip_1",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vsn_private_ip_1",
-    "type" : "string"
-  },
-  "sources" : {
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-        "key" : "vsn_private_ip_1"
-      }
-    }
-  }
-}
\ No newline at end of file
index 26a3a28..fd38db0 100644 (file)
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
 
 public class ResourceDefinitionTest {
     private Logger log = LoggerFactory.getLogger(ResourceDefinitionTest.class);
-    private String basePath = "load/resource_dictionary";
+    private String basePath = "./../../../../components/model-catalog/resource-dictionary/starter-dictionary";
 
     @Test
     public void testDictionaryDefinitionInputSource(){
@@ -46,7 +46,7 @@ public class ResourceDefinitionTest {
     @Test
     public void testDictionaryDefinitionDBSource(){
 
-        String fileName = basePath + "/processor-db-source.json";
+        String fileName = basePath + "/db-source.json";
         ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
         Assert.assertNotNull("Failed to populate dictionaryDefinition for processor-db type", resourceDefinition);
     }