Bug fix: Enrichment fails for processor-db source

Issue-ID: CCSDK-1324
Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
Change-Id: I21705485de9a11a65c1e032fc121c89917334104

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json
index b02397e..9ce89a9 100755 (executable)
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/activation-blueprint.json
@@ -19,6 +19,19 @@
   }, {
     "file" : "Definitions/policy_types.json"
   } ],
+  "dsl_definitions": {
+    "dynamic-db-source": {
+      "type": "maria-db",
+      "url": "jdbc:mysql://localhost:3306/sdnctl",
+      "username": "sdnctl",
+      "password": {
+        "get_attribute": [
+          "BPP",
+          "dynamic-db-source.password"
+        ]
+      }
+    }
+  },
   "topology_template" : {
     "inputs" : {
       "request-id" : {

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
index 265377b..3d10a7c 100755 (executable)
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
@@ -15,12 +15,14 @@
       "primary-db": {
         "type": "source-processor-db",
         "properties": {
-          "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+          "endpoint-selector": "dynamic-db-source",
+          "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping": {
           },
           "output-key-mapping": {
             "service-instance-id": "artifact_name"
-          }
+          },
+          "key-dependencies" : []
         }
       },
       "capability": {

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties
new file mode 100644 (file)
index 0000000..49a7eb4
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Environments/source-db.properties
@@ -0,0 +1 @@
+dynamic-db-source.password=sdnctl
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
new file mode 100644 (file)
index 0000000..adb8bd4
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "cloud_env",\r
+  "name": "cloud_env",\r
+  "property": {\r
+    "description": "cloud_env",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/cloud_env",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "cloud_env": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
new file mode 100644 (file)
index 0000000..007dc53
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "dcae_collector_ip",\r
+  "name": "dcae_collector_ip",\r
+  "property": {\r
+    "description": "dcae_collector_ip",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/dcae_collector_ip",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "dcae_collector_ip": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
new file mode 100644 (file)
index 0000000..7b59861
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "dcae_collector_port",\r
+  "name": "dcae_collector_port",\r
+  "property": {\r
+    "description": "dcae_collector_port",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/dcae_collector_port",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "dcae_collector_port": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
new file mode 100644 (file)
index 0000000..83ee035
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "demo_artifacts_version",\r
+  "name": "demo_artifacts_version",\r
+  "property": {\r
+    "description": "demo_artifacts_version",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/demo_artifacts_version",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "demo_artifacts_version": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
new file mode 100644 (file)
index 0000000..7a57153
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "gre_ipaddr",\r
+  "name": "gre_ipaddr",\r
+  "property": {\r
+    "description": "gre_ipaddr",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/gre_ipaddr",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "gre_ipaddr": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
new file mode 100644 (file)
index 0000000..90bccfb
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "install_script_version",\r
+  "name": "install_script_version",\r
+  "property": {\r
+    "description": "install_script_version",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/install_script_version",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "install_script_version": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
new file mode 100644 (file)
index 0000000..6d65241
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "int_pktgen_private_net_id",\r
+  "name": "int_pktgen_private_net_id",\r
+  "property": {\r
+    "description": "int_pktgen_private_net_id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/int_pktgen_private_net_id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "int_pktgen_private_net_id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
new file mode 100644 (file)
index 0000000..dc81034
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "int_pktgen_private_subnet_id",\r
+  "name": "int_pktgen_private_subnet_id",\r
+  "property": {\r
+    "description": "int_pktgen_private_subnet_id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/int_pktgen_private_subnet_id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "int_pktgen_private_subnet_id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
new file mode 100644 (file)
index 0000000..9110f03
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "int_private_net_id",\r
+  "name": "int_private_net_id",\r
+  "property": {\r
+    "description": "int_private_net_id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/int_private_net_id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "int_private_net_id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
new file mode 100644 (file)
index 0000000..202a555
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "int_private_subnet_id",\r
+  "name": "int_private_subnet_id",\r
+  "property": {\r
+    "description": "int_private_subnet_id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/int_private_subnet_id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "int_private_subnet_id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
new file mode 100644 (file)
index 0000000..03109ab
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "keypair",\r
+  "name": "keypair",\r
+  "property": {\r
+    "description": "keypair",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/keypair",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "keypair": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
new file mode 100644 (file)
index 0000000..751e993
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
@@ -0,0 +1,49 @@
+{\r
+  "tags": "management-prefix-id",\r
+  "name": "management-prefix-id",\r
+  "property": {\r
+    "description": "management-prefix-id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/management-prefix-id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "management-prefix-id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",\r
+        "input-key-mapping": {},\r
+        "output-key-mapping": {\r
+          "management-prefix-id": "prefix_id"\r
+        }\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
new file mode 100644 (file)
index 0000000..a4e6c11
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "nb_api_version",\r
+  "name": "nb_api_version",\r
+  "property": {\r
+    "description": "nb_api_version",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/nb_api_version",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "nb_api_version": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
index 8b88842..3709c0b 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
@@ -1,21 +1,37 @@
-{
-  "name" : "nexus_artifact_repo",
-  "tags" : "nexus_artifact_repo",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "nexus_artifact_repo",
-    "type" : "string"
-  },
-  "sources" : {
-    "default": {
-      "type": "source-default",
-      "properties": {
-      }
-    },
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
+{\r
+  "tags": "nexus_artifact_repo",\r
+  "name": "nexus_artifact_repo",\r
+  "property": {\r
+    "description": "nexus_artifact_repo",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/nexus_artifact_repo",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "nexus_artifact_repo": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
index 710042d..4cc28dc 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
@@ -1,25 +1,35 @@
-{
-  "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-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "nfc-naming-code",\r
+  "name": "nfc-naming-code",\r
+  "property": {\r
+    "description": "nfc-naming-code",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
+        "input-key-mapping": {\r
+          "vfccustomizationuuid": "vfccustomizationuuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "nfc-naming-code": "nfc_naming_code"\r
+        },\r
+        "key-dependencies": [\r
+          "vfccustomizationuuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
index 559ec3e..90d674c 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
@@ -1,21 +1,49 @@
-{
-  "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-processor-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"
-        }      
-         }
-    }
-  }
+{\r
+  "tags": "onap_private_net_cidr",\r
+  "name": "onap_private_net_cidr",\r
+  "property": {\r
+    "description": "onap_private_net_cidr",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/onap_private_net_cidr",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "onap_private_net_cidr": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",\r
+        "input-key-mapping": {},\r
+        "output-key-mapping": {\r
+          "onap_private_net_cidr": "prefix"\r
+        }\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
index 3dd74f7..c805e32 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
@@ -1,33 +1,38 @@
-{
-  "name": "onap_private_net_id",
-  "tags": "onap_private_net_id",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "onap_private_net_id"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "primary-config-data": {
-      "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/onap_private_net_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "onap_private_net_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
+{\r
+      "tags": "onap_private_net_id",\r
+      "name": "onap_private_net_id",\r
+      "property": {\r
+        "description": "onap_private_net_id",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/onap_private_net_id",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "onap_private_net_id": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
index 6cb22c3..80f62ea 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
@@ -1,33 +1,37 @@
-{
-  "name": "onap_private_subnet_id",
-  "tags": "onap_private_subnet_id",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "onap_private_subnet_id"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "primary-config-data": {
-      "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/onap_private_subnet_id",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "onap_private_subnet_id": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
+{\r
+  "tags": "onap_private_subnet_id",\r
+  "name": "onap_private_subnet_id",\r
+  "property": {\r
+    "description": "onap_private_subnet_id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/onap_private_subnet_id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "onap_private_subnet_id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
new file mode 100644 (file)
index 0000000..d1a4b79
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "pg_int",\r
+  "name": "pg_int",\r
+  "property": {\r
+    "description": "pg_int",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/pg_int",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "pg_int": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
new file mode 100644 (file)
index 0000000..6210bf9
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
@@ -0,0 +1,51 @@
+ {\r
+      "tags": "pktgen_private_net_cidr",\r
+      "name": "pktgen_private_net_cidr",\r
+      "property": {\r
+        "description": "pktgen_private_net_cidr",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/pktgen_private_net_cidr",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "pktgen_private_net_cidr": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        },\r
+      \r
+      "processor-db": {\r
+        "type": "source-processor-db",\r
+        "properties": {\r
+          "endpoint-selector": "dynamic-db-source",\r
+          "type": "SQL",\r
+          "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",\r
+          "input-key-mapping": {},\r
+          "output-key-mapping": {\r
+            "onap_private_net_cidr": "prefix"\r
+          }\r
+        }\r
+      }\r
+    }\r
+  }\r
+ 
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
new file mode 100644 (file)
index 0000000..a819388
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
@@ -0,0 +1,38 @@
+  {\r
+      "tags": "pktgen_private_net_id",\r
+      "name": "pktgen_private_net_id",\r
+      "property": {\r
+        "description": "pktgen_private_net_id",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/pktgen_private_net_id",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "pktgen_private_net_id": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    }\r
+  
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
index 3365d66..31ab6a9 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
@@ -1,21 +1,30 @@
-{
-  "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-processor-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"
-        }      
-         }
-    }
-  }
+{\r
+  "tags": "private-prefix-id",\r
+  "name": "private-prefix-id",\r
+  "property": {\r
+    "description": "private-prefix-id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",\r
+        "input-key-mapping": {},\r
+        "output-key-mapping": {\r
+          "private-prefix-id": "prefix_id"\r
+        }\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
new file mode 100644 (file)
index 0000000..7eff98d
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
@@ -0,0 +1,49 @@
+{\r
+  "tags": "private1-prefix-id",\r
+  "name": "private1-prefix-id",\r
+  "property": {\r
+    "description": "private1-prefix-id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/private1-prefix-id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "private1-prefix-id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",\r
+        "input-key-mapping": {},\r
+        "output-key-mapping": {\r
+          "private1-prefix-id": "prefix_id"\r
+        }\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
new file mode 100644 (file)
index 0000000..f3f0ae1
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
@@ -0,0 +1,49 @@
+{\r
+  "tags": "private2-prefix-id",\r
+  "name": "private2-prefix-id",\r
+  "property": {\r
+    "description": "private2-prefix-id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/private2-prefix-id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "private2-prefix-id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",\r
+        "input-key-mapping": {},\r
+        "output-key-mapping": {\r
+          "private2-prefix-id": "prefix_id"\r
+        }\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
index fe172ca..441a3c8 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
@@ -1,34 +1,37 @@
-{
-  "name": "pub_key",
-  "tags": "pub_key",
-  "updated-by": "Singal, Kapil <ks220y@att.com>",
-  "property": {
-    "type": "string",
-    "description": "pub_key"
-  },
-  "sources": {
-    "input": {
-      "type": "source-input"
-    },
-    "primary-config-data": {
-      "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/pub_key",
-        "path": "/param/0/value",
-        "input-key-mapping": {
-          "service-instance-id": "service-instance-id",
-          "vnf-id": "vnf-id"
-        },
-        "output-key-mapping": {
-          "pub_key": "value"
-        },
-        "key-dependencies": [
-          "service-instance-id",
-          "vnf-id"
-        ]
-      }
-    }
-  }
-}
-
+{\r
+  "tags": "pub_key",\r
+  "name": "pub_key",\r
+  "property": {\r
+    "description": "pub_key",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/pub_key",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "pub_key": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
index a4fbc95..7c27413 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
@@ -1,19 +1,38 @@
-{
-               "name": "public_net_id",
-               "tags": "public_net_id",
-               "updated-by" : "Singal, Kapil <ks220y@att.com>",
-               "property": {
-                       "type": "string",
-                       "description" : "public_net_id"
-               },
-               "sources": {
-                       "default": {
-                               "type": "source-default",
-                               "properties": {
-                               }
-                       },
-                       "input": {
-                               "type": "source-input"
-                       }
-               }
-}
+  {\r
+      "tags": "public_net_id",\r
+      "name": "public_net_id",\r
+      "property": {\r
+        "description": "public_net_id",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/public_net_id",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "public_net_id": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
index 38f07e8..14437c9 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
@@ -1,21 +1,38 @@
-{
-  "name" : "sec_group",
-  "tags" : "sec_group",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "sec_group",
-    "type" : "string"
-  },
-  "sources" : {
-    "default": {
-      "type": "source-default",
-      "properties": {
-      }
-    },
-    "input" : {
-      "type" : "source-input",
-      "properties" : {
-      }
-    }
-  }
-}
\ No newline at end of file
+  {\r
+      "tags": "sec_group",\r
+      "name": "sec_group",\r
+      "property": {\r
+        "description": "sec_group",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/sec_group",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "sec_group": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
new file mode 100644 (file)
index 0000000..323c33e
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
@@ -0,0 +1,39 @@
+  {\r
+  \r
+      "tags": "vdns_flavor_name",\r
+      "name": "vdns_flavor_name",\r
+      "property": {\r
+        "description": "vdns_flavor_name",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/vdns_flavor_name",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "vdns_flavor_name": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
new file mode 100644 (file)
index 0000000..bc70891
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vdns_image_name",\r
+  "name": "vdns_image_name",\r
+  "property": {\r
+    "description": "vdns_image_name",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vdns_image_name",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vdns_image_name": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
new file mode 100644 (file)
index 0000000..715cbc7
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vdns_int_private_ip_0",\r
+  "name": "vdns_int_private_ip_0",\r
+  "property": {\r
+    "description": "vdns_int_private_ip_0",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vdns_int_private_ip_0",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vdns_int_private_ip_0": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
new file mode 100644 (file)
index 0000000..c02e09d
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
@@ -0,0 +1,38 @@
+ {\r
+      "tags": "vdns_name_0",\r
+      "name": "vdns_name_0",\r
+      "property": {\r
+        "description": "vdns_name_0",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "Singal, Kapil <ks220y@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/vdns_name_0",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "vdns_name_0": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
new file mode 100644 (file)
index 0000000..420df6a
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vdns_onap_private_ip_0",\r
+  "name": "vdns_onap_private_ip_0",\r
+  "property": {\r
+    "description": "vdns_onap_private_ip_0",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vdns_onap_private_ip_0",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vdns_onap_private_ip_0": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
index e17de2b..5e5f071 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
@@ -1,25 +1,35 @@
-{
-  "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-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vf-module-label",\r
+  "name": "vf-module-label",\r
+  "property": {\r
+    "description": "vf-module-label",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "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",\r
+        "input-key-mapping": {\r
+          "customizationid": "vf-module-model-customization-uuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "vf-module-label": "vf_module_label"\r
+        },\r
+        "key-dependencies": [\r
+          "vf-module-model-customization-uuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
index 6736e4f..25760c8 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-model-customization-uuid.json
@@ -1,15 +1,18 @@
-{
-  "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" : { }
-    }
-  }
+{\r
+  "tags": "vf-module-model-customization-uuid",\r
+  "name": "vf-module-model-customization-uuid",\r
+  "property": {\r
+    "description": "vf-module-model-customization-uuid",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
index abbe817..f970682 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
@@ -1,25 +1,35 @@
-{
-  "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-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vf-module-type",\r
+  "name": "vf-module-type",\r
+  "property": {\r
+    "description": "vf-module-type",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",\r
+        "input-key-mapping": {\r
+          "customizationid": "vf-module-model-customization-uuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "vf-module-type": "vf_module_type"\r
+        },\r
+        "key-dependencies": [\r
+          "vf-module-model-customization-uuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
new file mode 100644 (file)
index 0000000..d78ba55
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf_module_id.json
@@ -0,0 +1,19 @@
+  {\r
+      "tags": "vf_module_id",\r
+      "name": "vf_module_id",\r
+      "property": {\r
+        "description": "vf_module_id",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
index 7ed7674..1f8c1d2 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
@@ -1,25 +1,35 @@
-{
-  "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-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vfccustomizationuuid",\r
+  "name": "vfccustomizationuuid",\r
+  "property": {\r
+    "description": "vfccustomizationuuid",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "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",\r
+        "input-key-mapping": {\r
+          "vfmodulecustomizationuuid": "vf-module-model-customization-uuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "vfccustomizationuuid": "vnf_customid"\r
+        },\r
+        "key-dependencies": [\r
+          "vf-module-model-customization-uuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vip.json b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
new file mode 100644 (file)
index 0000000..cbc0c5b
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vip.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vip",\r
+  "name": "vip",\r
+  "property": {\r
+    "description": "vip",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vip",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vip": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
new file mode 100644 (file)
index 0000000..74fae46
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vlb_0_int_pktgen_private_port_0_mac",\r
+  "name": "vlb_0_int_pktgen_private_port_0_mac",\r
+  "property": {\r
+    "description": "vlb_0_int_pktgen_private_port_0_mac",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_0_int_pktgen_private_port_0_mac",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vlb_0_int_pktgen_private_port_0_mac": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
new file mode 100644 (file)
index 0000000..c1bdb60
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vlb_flavor_name",\r
+  "name": "vlb_flavor_name",\r
+  "property": {\r
+    "description": "vlb_flavor_name",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_flavor_name",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vlb_flavor_name": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
new file mode 100644 (file)
index 0000000..e04697f
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vlb_image_name",\r
+  "name": "vlb_image_name",\r
+  "property": {\r
+    "description": "vlb_image_name",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_image_name",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vlb_image_name": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
new file mode 100644 (file)
index 0000000..99448b8
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
@@ -0,0 +1,38 @@
+  {\r
+      "tags": "vlb_int_pktgen_private_ip_0",\r
+      "name": "vlb_int_pktgen_private_ip_0",\r
+      "property": {\r
+        "description": "vlb_int_pktgen_private_ip_0",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/vlb_int_pktgen_private_ip_0",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "vlb_int_pktgen_private_ip_0": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    }\r
+  
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
new file mode 100644 (file)
index 0000000..9c0855b
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
@@ -0,0 +1,38 @@
+ {\r
+      "tags": "vlb_int_private_ip_0",\r
+      "name": "vlb_int_private_ip_0",\r
+      "property": {\r
+        "description": "vlb_int_private_ip_0",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "Singal, Kapil <ks220y@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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/vlb_int_private_ip_0",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "vlb_int_private_ip_0": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
new file mode 100644 (file)
index 0000000..4be4c82
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vlb_name_0",\r
+  "name": "vlb_name_0",\r
+  "property": {\r
+    "description": "vlb_name_0",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_name_0",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vlb_name_0": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
new file mode 100644 (file)
index 0000000..5a38f92
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vlb_onap_private_ip_0",\r
+  "name": "vlb_onap_private_ip_0",\r
+  "property": {\r
+    "description": "vlb_onap_private_ip_0",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_onap_private_ip_0",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "private2-prefix-id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
new file mode 100644 (file)
index 0000000..3cda767
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
@@ -0,0 +1,49 @@
+{\r
+  "tags": "vlb_private_net_cidr",\r
+  "name": "vlb_private_net_cidr",\r
+  "property": {\r
+    "description": "vlb_private_net_cidr",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_private_net_cidr",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vlb_private_net_cidr": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",\r
+        "input-key-mapping": {},\r
+        "output-key-mapping": {\r
+          "vlb_private_net_cidr": "prefix"\r
+        }\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
new file mode 100644 (file)
index 0000000..563dd45
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vlb_private_net_id",\r
+  "name": "vlb_private_net_id",\r
+  "property": {\r
+    "description": "vlb_private_net_id",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vlb_private_net_id",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vlb_private_net_id": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
index a0bb607..58e7105 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
@@ -1,25 +1,35 @@
-{
-  "name" : "vm-type",
-  "tags" : "vm-type",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vm-type",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vm-type",\r
+  "name": "vm-type",\r
+  "property": {\r
+    "description": "vm-type",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
+        "input-key-mapping": {\r
+          "vfccustomizationuuid": "vfccustomizationuuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "vm-type": "vm_type"\r
+        },\r
+        "key-dependencies": [\r
+          "vfccustomizationuuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
index 7f3a18f..f179957 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
@@ -1,15 +1,38 @@
-{
-  "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" : { }
-    }
-  }
-}
\ No newline at end of file
+  {\r
+      "tags": "vnf-id",\r
+      "name": "vnf-id",\r
+      "property": {\r
+        "description": "vnf-id",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        },\r
+        "primary-config-data": {\r
+          "type": "source-rest",\r
+          "properties": {\r
+            "type": "JSON",\r
+            "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-id",\r
+            "path": "/param/0/value",\r
+            "input-key-mapping": {\r
+              "service-instance-id": "service-instance-id",\r
+              "vnf-id": "vnf-id"\r
+            },\r
+            "output-key-mapping": {\r
+              "vnf-id": "value"\r
+            },\r
+            "key-dependencies": [\r
+              "service-instance-id",\r
+              "vnf-id"\r
+            ]\r
+          }\r
+        }\r
+      }\r
+    }\r
+  
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
index 4c0320a..09b7380 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
@@ -1,28 +1,55 @@
-{
-  "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" : {
-    "primary-config-data" : {
-      "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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vnf-name",\r
+  "name": "vnf-name",\r
+  "property": {\r
+    "description": "vnf-name",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-name": "vnf-name"\r
+        },\r
+        "output-key-mapping": {\r
+          "vnf-name": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-name"\r
+        ]\r
+      }\r
+    },\r
+    "primary-aai-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "verb": "GET",\r
+        "url-path": "/aai/v14/network/generic-vnfs/generic-vnf/$vnf-id",\r
+        "path": "",\r
+        "input-key-mapping": {\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vnf-name": "vnf-name"\r
+        },\r
+        "key-dependencies": [\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf_id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_id.json
new file mode 100644 (file)
index 0000000..7afb3bf
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf_id.json
@@ -0,0 +1,19 @@
+ {\r
+      "tags": "vnf_id",\r
+      "name": "vnf_id",\r
+      "property": {\r
+        "description": "vnf_id",\r
+        "type": "string"\r
+      },\r
+      "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+      "sources": {\r
+        "input": {\r
+          "type": "source-input"\r
+        },\r
+        "default": {\r
+          "type": "source-default",\r
+          "properties": {}\r
+        }\r
+      }\r
+    \r
+  }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
index 40604cc..855ca22 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
@@ -1,25 +1,35 @@
-{
-  "name" : "vnfc-model-invariant-uuid",
-  "tags" : "vnfc-model-invariant-uuid",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnfc-model-invariant-uuid for SRIOV VPE template",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vnfc-model-invariant-uuid",\r
+  "name": "vnfc-model-invariant-uuid",\r
+  "property": {\r
+    "description": "vnfc-model-invariant-uuid",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
+        "input-key-mapping": {\r
+          "vfccustomizationuuid": "vfccustomizationuuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "vnfc-model-invariant-uuid": "vfc_invariant_uuid"\r
+        },\r
+        "key-dependencies": [\r
+          "vfccustomizationuuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
index 75bb2e5..b6027fe 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
@@ -1,25 +1,35 @@
-{
-  "name" : "vnfc-model-version",
-  "tags" : "vnfc-model-version",
-  "updated-by" : "Singal, Kapil <ks220y@att.com>",
-  "property" : {
-    "description" : "vnfc-model-version for  SRIOV VPE template",
-    "type" : "string"
-  },
-  "sources" : {
-    "processor-db" : {
-      "type" : "source-processor-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" ]
-      }
-    }
-  }
+{\r
+  "tags": "vnfc-model-version",\r
+  "name": "vnfc-model-version",\r
+  "property": {\r
+    "description": "vnfc-model-version",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "processor-db": {\r
+      "type": "source-processor-db",\r
+      "properties": {\r
+        "endpoint-selector": "dynamic-db-source",\r
+        "type": "SQL",\r
+        "query": "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",\r
+        "input-key-mapping": {\r
+          "vfccustomizationuuid": "vfccustomizationuuid"\r
+        },\r
+        "output-key-mapping": {\r
+          "vnfc-model-version": "vnfc_model_version"\r
+        },\r
+        "key-dependencies": [\r
+          "vfccustomizationuuid"\r
+        ]\r
+      }\r
+    }\r
+  }\r
 }
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
new file mode 100644 (file)
index 0000000..6a4b1bc
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vpg_flavor_name",\r
+  "name": "vpg_flavor_name",\r
+  "property": {\r
+    "description": "vpg_flavor_name",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vpg_flavor_name",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vpg_flavor_name": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
new file mode 100644 (file)
index 0000000..cfeab71
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vpg_image_name",\r
+  "name": "vpg_image_name",\r
+  "property": {\r
+    "description": "vpg_image_name",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vpg_image_name",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vpg_image_name": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
new file mode 100644 (file)
index 0000000..d35cc1e
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vpg_int_pktgen_private_ip_0",\r
+  "name": "vpg_int_pktgen_private_ip_0",\r
+  "property": {\r
+    "description": "vpg_int_pktgen_private_ip_0",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "Singal, Kapil <ks220y@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vpg_int_pktgen_private_ip_0",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vpg_int_pktgen_private_ip_0": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
new file mode 100644 (file)
index 0000000..b6865ac
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
@@ -0,0 +1,37 @@
+{\r
+  "tags": "vpg_onap_private_ip_0",\r
+  "name": "vpg_onap_private_ip_0",\r
+  "property": {\r
+    "description": "vpg_onap_private_ip_0",\r
+    "type": "string"\r
+  },\r
+  "updated-by": "Singal, Kapil <ks220y@att.com>",\r
+  "sources": {\r
+    "input": {\r
+      "type": "source-input"\r
+    },\r
+    "default": {\r
+      "type": "source-default",\r
+      "properties": {}\r
+    },\r
+    "primary-config-data": {\r
+      "type": "source-rest",\r
+      "properties": {\r
+        "type": "JSON",\r
+        "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/vpg_onap_private_ip_0",\r
+        "path": "/param/0/value",\r
+        "input-key-mapping": {\r
+          "service-instance-id": "service-instance-id",\r
+          "vnf-id": "vnf-id"\r
+        },\r
+        "output-key-mapping": {\r
+          "vpg_onap_private_ip_0": "value"\r
+        },\r
+        "key-dependencies": [\r
+          "service-instance-id",\r
+          "vnf-id"\r
+        ]\r
+      }\r
+    }\r
+  }\r
+}
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
index e8b61a8..987390f 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
@@ -124,7 +124,8 @@ open class DatabaseResourceAssignmentProcessor(private val bluePrintDBLibPropert
         checkNotEmpty(resourceAssignment.dictionaryName) {
             "resource assignment dictionary name is not defined for template key (${resourceAssignment.name})"
         }
-        checkEquals(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, resourceAssignment.dictionarySource) {
+        check(resourceAssignment.dictionarySource in arrayOf(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, ResourceDictionaryConstants.SOURCE_PRIMARY_DB))
+        {
             "resource assignment source is not ${ResourceDictionaryConstants.SOURCE_PROCESSOR_DB} but it is ${resourceAssignment.dictionarySource}"
         }
     }

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceResolutionProcessorTest.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceResolutionProcessorTest.kt
index 89674ea..f73197e 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceResolutionProcessorTest.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceResolutionProcessorTest.kt
@@ -49,7 +49,7 @@ class DatabaseResourceResolutionProcessorTest {
     lateinit var databaseResourceAssignmentProcessor: DatabaseResourceAssignmentProcessor
 
     @Test
-    fun `test database resource resolution`() {
+    fun `test database resource resolution processor db`() {
         runBlocking {
             val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(
                     "./../../../../components/model-catalog/blueprint-model/test-blueprint/baseconfiguration")
@@ -74,4 +74,31 @@ class DatabaseResourceResolutionProcessorTest {
             println(processorName)
         }
     }
+
+    @Test
+    fun `test database resource resolution primary db`() {
+        runBlocking {
+            val bluePrintContext = BluePrintMetadataUtils.getBluePrintContext(
+                    "./../../../../components/model-catalog/blueprint-model/test-blueprint/capability_python")
+
+            val resourceAssignmentRuntimeService = ResourceAssignmentRuntimeService("1234", bluePrintContext)
+
+            databaseResourceAssignmentProcessor.raRuntimeService = resourceAssignmentRuntimeService
+            databaseResourceAssignmentProcessor.resourceDictionaries = ResourceAssignmentUtils
+                    .resourceDefinitions(bluePrintContext.rootPath)
+
+            val resourceAssignment = ResourceAssignment().apply {
+                name = "service-instance-id"
+                dictionaryName = "service-instance-id"
+                dictionarySource = "primary-db"
+                property = PropertyDefinition().apply {
+                    type = "string"
+                }
+            }
+
+            val processorName = databaseResourceAssignmentProcessor.applyNB(resourceAssignment)
+            assertNotNull(processorName, "couldn't get Database resource assignment processor name")
+            println(processorName)
+        }
+    }
 }
\ 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
index 4c0320a..bcfea9f 100644 (file)
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
@@ -7,21 +7,41 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data" : {
-      "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"
+    "primary-config-data": {
+      "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"
+        "output-key-mapping": {
+          "vnf-name": "value"
         },
-        "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+        "key-dependencies": [
+          "service-instance-id",
+          "vnf-name"
+        ]
+      }
+    },
+    "primary-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"
+        ]
       }
     }
   }