Make source-db consistent across samples 42/93642/9
authorOleg Mitsura <oleg.mitsura@amdocs.com>
Thu, 15 Aug 2019 20:41:17 +0000 (16:41 -0400)
committerOleg Mitsura <oleg.mitsura@amdocs.com>
Tue, 27 Aug 2019 16:35:23 +0000 (12:35 -0400)
Issue-Id: CCSDK-1623

Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf

184 files changed:
cds-ui/client/src/assets/sample-licenses.json
components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/node_types.json
components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json
components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/node_types.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/resources_definition_types.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/base_template-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/baseconfig-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/incremental-config-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/nf-params-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vdns-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vlb-mapping.json
components/model-catalog/blueprint-model/service-blueprint/vLB/Templates/vpkg-mapping.json
components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
components/model-catalog/definition-type/starter-type/node_type/source-db.json [moved from components/model-catalog/definition-type/starter-type/node_type/source-processor-db.json with 100% similarity]
components/model-catalog/resource-dictionary/starter-dictionary/cloud_env.json
components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_ip.json
components/model-catalog/resource-dictionary/starter-dictionary/dcae_collector_port.json
components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/demo_artifacts_version.json
components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/gre_ipaddr.json
components/model-catalog/resource-dictionary/starter-dictionary/image_name.json
components/model-catalog/resource-dictionary/starter-dictionary/install_script_version.json
components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_net_id.json
components/model-catalog/resource-dictionary/starter-dictionary/int_pktgen_private_subnet_id.json
components/model-catalog/resource-dictionary/starter-dictionary/int_private_net_id.json
components/model-catalog/resource-dictionary/starter-dictionary/int_private_subnet_id.json
components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/key_name.json
components/model-catalog/resource-dictionary/starter-dictionary/keypair.json
components/model-catalog/resource-dictionary/starter-dictionary/management-prefix-id.json
components/model-catalog/resource-dictionary/starter-dictionary/mdsal-source.json
components/model-catalog/resource-dictionary/starter-dictionary/nb_api_version.json
components/model-catalog/resource-dictionary/starter-dictionary/nexus_artifact_repo.json
components/model-catalog/resource-dictionary/starter-dictionary/nf-role.json
components/model-catalog/resource-dictionary/starter-dictionary/nfc-naming-code.json
components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_cidr.json
components/model-catalog/resource-dictionary/starter-dictionary/onap_private_net_id.json
components/model-catalog/resource-dictionary/starter-dictionary/onap_private_subnet_id.json
components/model-catalog/resource-dictionary/starter-dictionary/pg_int.json
components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_cidr.json
components/model-catalog/resource-dictionary/starter-dictionary/pktgen_private_net_id.json
components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/private-prefix-id.json
components/model-catalog/resource-dictionary/starter-dictionary/private1-prefix-id.json
components/model-catalog/resource-dictionary/starter-dictionary/private2-prefix-id.json
components/model-catalog/resource-dictionary/starter-dictionary/protected-prefix-id.json
components/model-catalog/resource-dictionary/starter-dictionary/protected_private_net_cidr.json
components/model-catalog/resource-dictionary/starter-dictionary/pub_key.json
components/model-catalog/resource-dictionary/starter-dictionary/public_net_id.json
components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json [moved from components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json with 81% similarity]
components/model-catalog/resource-dictionary/starter-dictionary/sample-licenses.json
components/model-catalog/resource-dictionary/starter-dictionary/sample-mdsal-source.json
components/model-catalog/resource-dictionary/starter-dictionary/sec_group.json
components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json
components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/unprotected-prefix-id.json
components/model-catalog/resource-dictionary/starter-dictionary/unprotected_private_net_cidr.json
components/model-catalog/resource-dictionary/starter-dictionary/vdns_flavor_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vdns_image_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vdns_int_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vdns_name_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vdns_onap_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vf-module-label.json
components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json [new file with mode: 0644]
components/model-catalog/resource-dictionary/starter-dictionary/vf-module-type.json
components/model-catalog/resource-dictionary/starter-dictionary/vf-naming-policy.json
components/model-catalog/resource-dictionary/starter-dictionary/vf-nf-code.json
components/model-catalog/resource-dictionary/starter-dictionary/vfccustomizationuuid.json
components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vfw_private_ip_1.json
components/model-catalog/resource-dictionary/starter-dictionary/vip.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_0_int_pktgen_private_port_0_mac.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_flavor_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_image_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_pktgen_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_int_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_name_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_onap_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_cidr.json
components/model-catalog/resource-dictionary/starter-dictionary/vlb_private_net_id.json
components/model-catalog/resource-dictionary/starter-dictionary/vm-type.json
components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json
components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json
components/model-catalog/resource-dictionary/starter-dictionary/vnf_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-invariant-uuid.json
components/model-catalog/resource-dictionary/starter-dictionary/vnfc-model-version.json
components/model-catalog/resource-dictionary/starter-dictionary/vpg_flavor_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vpg_image_name.json
components/model-catalog/resource-dictionary/starter-dictionary/vpg_int_pktgen_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vpg_onap_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vpg_private_ip_0.json
components/model-catalog/resource-dictionary/starter-dictionary/vsn_private_ip_0.json
components/model-catalog/resource-dictionary/test-dictionary/create_netbox_ip.json
components/model-catalog/resource-dictionary/test-dictionary/delete_netbox_ip.json
components/model-catalog/resource-dictionary/test-dictionary/vf-module-type.json
docs/datadictionary/create_netbox_ip_address.rst
ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
ms/blueprintsprocessor/application/src/main/resources/application.properties
ms/blueprintsprocessor/application/src/test/resources/application-test.properties
ms/blueprintsprocessor/application/src/test/resources/application.properties
ms/blueprintsprocessor/distribution/src/main/dc/docker-compose.yaml
ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessorTest.kt
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/application-test.properties
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/dt-location.json [moved from ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/dt-location.json with 94% similarity]
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-array.json [moved from ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-array.json with 88% similarity]
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-complex.json [moved from ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-complex.json with 91% similarity]
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/processor-db-simple.json [moved from ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/primary-db-simple.json with 90% similarity]
ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/processor-db/resource-assignments-simple.json [moved from ms/blueprintsprocessor/functions/resource-resolution/src/test/resources/mapping/primary-db/resource-assignments-simple.json with 85% similarity]
ms/blueprintsprocessor/functions/restconf-executor/src/test/resources/application-test.properties
ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibConfiguration.kt
ms/blueprintsprocessor/modules/commons/db-lib/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/db/BluePrintDBLibData.kt
ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/application-test.properties
ms/blueprintsprocessor/modules/inbounds/configs-api/src/test/resources/application-test.properties
ms/blueprintsprocessor/modules/inbounds/resource-api/src/test/resources/application-test.properties
ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/selfservice/api/mock/Mock.kt
ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/application-test.properties
ms/controllerblueprints/application/src/main/resources/application-dev.properties
ms/controllerblueprints/application/src/main/resources/application.properties
ms/controllerblueprints/application/src/test/resources/application.properties
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/service/BluePrintContext.kt
ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/utils/JacksonUtils.kt
ms/controllerblueprints/modules/blueprint-core/src/test/resources/dictionary/dictionary_schema.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/mdsal-source.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nf-role.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/nfc-naming-code.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/onap_private_net_cidr.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json [deleted file]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/private-prefix-id.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/processor-db-source.json [moved from components/model-catalog/resource-dictionary/starter-dictionary/primary-db-source.json with 93% similarity]
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected-prefix-id.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/protected_private_net_cidr.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected-prefix-id.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/unprotected_private_net_cidr.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-label.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-module-type.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-naming-policy.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vf-nf-code.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfccustomizationuuid.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vm-type.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf-name.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnf_name.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-invariant-uuid.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vnfc-model-version.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/ResourceDefinitionTest.java
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
ms/controllerblueprints/modules/resource-dict/src/test/java/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryUtilsTest.java
ms/controllerblueprints/modules/resource-dict/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/cyclic.json
ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/duplicate.json
ms/controllerblueprints/modules/resource-dict/src/test/resources/validation/success.json
ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/controller/ControllerBlueprintExceptionHandler.kt
ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/repository/ResourceDictionaryRepositoryTest.kt
ms/controllerblueprints/modules/service/src/test/resources/application.properties
ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json

index c0f78ac..86a8e5d 100644 (file)
@@ -11,7 +11,7 @@
   },\r
   "updated-by": "brindasanth@onap.com",\r
   "sources": {\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -26,4 +26,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index f94214a..599e377 100644 (file)
       "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
       "derived_from" : "tosca.nodes.Root"
     }
   }
-}
\ No newline at end of file
+}
index 18d0acb..2276150 100644 (file)
@@ -26,7 +26,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -56,7 +56,7 @@
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private\"",
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private\"",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
       "input" : {
         "type" : "source-input"
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
         "properties" : { }
       },
       "any-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
     "updated-by" : "adetalhouet",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
       }
     }
   }
-}
\ No newline at end of file
+}
index 2581748..5829aec 100644 (file)
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index c07007c..6315959 100644 (file)
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index d3cfdeb..5782faa 100644 (file)
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vsn_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vpg_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index 84bc731..fedf0ba 100644 (file)
@@ -65,7 +65,7 @@
     },
     "input-param": false,
     "dictionary-name": "vnf-name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vfw_private_ip_1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index 0897af5..7a44860 100644 (file)
       "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
       "derived_from" : "tosca.nodes.Vnf"
     }
   }
-}
\ No newline at end of file
+}
index 4fa179f..fdff0d8 100644 (file)
@@ -30,7 +30,7 @@
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
@@ -58,7 +58,7 @@
     },
     "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -75,7 +75,7 @@
           "key-dependencies" : [ "vf-module-id", "service-instance-id", "vnf-id" ]
         }
       },
-      "primary-aai-data" : {
+      "aai-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "PATCH",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
           "input-key-mapping" : { }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "any-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
           "input-key-mapping" : { },
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
           "key-dependencies" : [ "service-instance-id", "vnf-id" ]
         }
       },
-      "primary-aai-data" : {
+      "aai-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
           }
         }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "type" : "SQL",
           "query" : "select VFC_MODEL.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
         "properties" : { }
       },
       "processor-db" : {
-        "type" : "source-processor-db",
+        "type" : "source-db",
         "properties" : {
           "endpoint-selector" : "dynamic-db-source",
           "type" : "SQL",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
         "type" : "source-default",
         "properties" : { }
       },
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "verb" : "GET",
       }
     }
   }
-}
\ No newline at end of file
+}
index 5a3da4e..3cf9ae9 100644 (file)
@@ -78,7 +78,7 @@
          },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index 246cb40..193bc21 100644 (file)
@@ -55,7 +55,7 @@
     },\r
     "input-param": false,\r
     "dictionary-name": "vdns_vf_module_id",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
          "service-instance-id",\r
       "vnf-id"\r
@@ -78,7 +78,7 @@
     },\r
     "input-param": false,\r
     "dictionary-name": "vdns_int_private_ip_0",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
       "service-instance-id",\r
       "vnf-id",\r
     },\r
     "input-param": false,\r
     "dictionary-name": "vdns_onap_private_ip_0",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
       "service-instance-id",\r
       "vnf-id",\r
     ],\r
     "version": 0\r
   }\r
-]
\ No newline at end of file
+]\r
index 914565a..ce8db22 100644 (file)
@@ -55,7 +55,7 @@
     },\r
     "input-param": false,\r
     "dictionary-name": "vdns_vf_module_id",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
        "service-instance-id",\r
       "vnf-id"\r
@@ -78,7 +78,7 @@
     },\r
     "input-param": false,\r
     "dictionary-name": "vdns_int_private_ip_0",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
       "service-instance-id",\r
       "vnf-id",\r
     },\r
     "input-param": false,\r
     "dictionary-name": "vdns_onap_private_ip_0",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
       "service-instance-id",\r
       "vnf-id",\r
     ],\r
     "version": 0\r
   }\r
-]
\ No newline at end of file
+]\r
index 57152c9..d241aaf 100644 (file)
     },\r
     "input-param": false,\r
     "dictionary-name": "vlb_onap_private_ip_0",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": [\r
       "service-instance-id",\r
       "vnf-id"\r
     ],\r
     "version": 0\r
   }\r
-]
\ No newline at end of file
+]\r
index c59c134..8e84897 100644 (file)
@@ -15,7 +15,7 @@
     },
     "input-param": false,
     "dictionary-name": "cloud_env",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -38,7 +38,7 @@
     },
     "input-param": false,
     "dictionary-name": "create-md-sal-vnf-param",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
        "service-instance-id",
          "vnf-id",
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
         "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
          },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
          },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index 8ec07e9..9767296 100644 (file)
@@ -81,7 +81,7 @@
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
          },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
          },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_int_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     "dependencies": [],
     "version": 0
   }
-]
\ No newline at end of file
+]
index 472d766..8edac3c 100644 (file)
@@ -57,7 +57,7 @@
     },
     "input-param": false,
     "dictionary-name": "demo_artifacts_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -80,7 +80,7 @@
     },
     "input-param": false,
     "dictionary-name": "install_script_version",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pktgen_private_net_cidr",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "public_net_id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "pub_key",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "key_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "sec_group",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
          },
     "input-param": false,
     "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
          },
     "input-param": false,
     "dictionary-name": "image_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
          "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vlb_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vpg_int_pktgen_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
     ],
     "version": 0
   }
-]
\ No newline at end of file
+]
index 67d2a91..9b155c2 100644 (file)
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
index 67d2a91..9b155c2 100644 (file)
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
index 3595a9f..c57ebe7 100644 (file)
       "properties": {},
       "derived_from": "tosca.nodes.ResourceSource"
     },
-    "source-processor-db": {
+    "source-db": {
       "description": "This is Database Resource Source Node Type",
       "version": "1.0.0",
       "properties": {
       "derived_from": "tosca.nodes.Vnf"
     }
   }
-}
\ No newline at end of file
+}
index fe364f9..ecd4828 100644 (file)
@@ -27,7 +27,7 @@
         "properties": {}
       },
       "processor-db": {
-        "type": "source-processor-db",
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -65,7 +65,7 @@
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
     "sources": {
-      "primary-config-data": {
+      "config-data": {
         "type": "source-rest",
         "properties": {
           "verb": "GET",
@@ -96,7 +96,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
       }
     }
   }
-}
\ No newline at end of file
+}
index 37bad8d..178d2be 100644 (file)
@@ -1,9 +1,9 @@
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data.token=sampletoken
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data.userId=sampleuser
+blueprintsprocessor.restclient.config-data.token=sampletoken
 
-blueprintsprocessor.restclient.primary-config-data1.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data1.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data1.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data1.token=sampletoken
\ No newline at end of file
+blueprintsprocessor.restclient.config-data1.type=basic-auth
+blueprintsprocessor.restclient.config-data1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data1.userId=sampleuser
+blueprintsprocessor.restclient.config-data1.token=sampletoken
index 3d10a7c..4c128a9 100755 (executable)
@@ -12,8 +12,8 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-db": {
-        "type": "source-processor-db",
+      "processor-db": {
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -50,4 +50,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 6ec3b41..da498e3 100644 (file)
@@ -1,11 +1,5 @@
 {
   "artifact_types" : {
-    "artifact-directed-graph" : {
-      "description" : "Directed Graph File",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json", "xml" ]
-    },
     "artifact-mapping-resource" : {
       "description" : "Resource Mapping File used along with Configuration template",
       "version" : "1.0.0",
index 5c0f1b3..2a4f394 100644 (file)
@@ -13,6 +13,9 @@
         "interface-name" : {
           "type" : "string"
         },
+        "golden-vf-module-type" : {
+          "type" : "string"
+        },
         "interface-description" : {
           "type" : "string"
         },
@@ -23,9 +26,6 @@
           "type" : "string",
           "default" : "6"
         },
-        "vf-module-type" : {
-          "type" : "string"
-        },
         "vf-module-number" : {
           "type" : "string",
           "default" : "3"
index 7e1bd8b..7c73752 100644 (file)
 {
-  "metadata": {
-    "template_author": "Alexis de Talhouët",
-    "author-email": "adetalhouet89@gmail.com",
-    "user-groups": "ADMIN, OPERATION",
-    "template_name": "golden",
-    "template_version": "1.0.0",
-    "template_tags": "test"
+  "tosca_definitions_version" : "controller_blueprint_1_0_0",
+  "metadata" : {
+    "template_author" : "Alexis de Talhouët",
+    "author-email" : "adetalhouet89@gmail.com",
+    "user-groups" : "ADMIN, OPERATION",
+    "template_name" : "golden",
+    "template_version" : "1.0.0",
+    "template_tags" : "test"
   },
-  "imports": [
-    {
-      "file": "Definitions/data_types.json"
+  "imports" : [ {
+    "file" : "Definitions/data_types.json"
+  }, {
+    "file" : "Definitions/relationship_types.json"
+  }, {
+    "file" : "Definitions/artifact_types.json"
+  }, {
+    "file" : "Definitions/node_types.json"
+  }, {
+    "file" : "Definitions/policy_types.json"
+  } ],
+  "dsl_definitions" : {
+    "ipam-1" : {
+      "type" : "token-auth",
+      "url" : "http://netbox-nginx:8080",
+      "token" : "Token 0123456789abcdef0123456789abcdef01234567"
     },
-    {
-      "file": "Definitions/relationship_types.json"
-    },
-    {
-      "file": "Definitions/artifact_types.json"
-    },
-    {
-      "file": "Definitions/node_types.json"
-    },
-    {
-      "file": "Definitions/policy_types.json"
-    }
-  ],
-  "dsl_definitions": {
-    "ipam-1": {
-      "type": "token-auth",
-      "url": "http://netbox-nginx:8080",
-      "token": "Token 0123456789abcdef0123456789abcdef01234567"
-    },
-    "config-deploy-properties": {
-      "resolution-key": {
-        "get_input": "resolution-key"
+    "config-deploy-properties" : {
+      "resolution-key" : {
+        "get_input" : "resolution-key"
       }
     }
   },
-  "topology_template": {
-    "workflows": {
-      "resource-assignment": {
-        "steps": {
-          "resource-assignment": {
-            "description": "Resource Assign Workflow",
-            "target": "resource-assignment",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+  "topology_template" : {
+    "workflows" : {
+      "resource-assignment" : {
+        "steps" : {
+          "resource-assignment" : {
+            "description" : "Resource Assign Workflow",
+            "target" : "resource-assignment",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resource-assignment-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(resource-assignment).",
-            "required": true,
-            "type": "dt-resource-assignment-properties"
+        "inputs" : {
+          "resource-assignment-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(resource-assignment).",
+            "required" : true,
+            "type" : "dt-resource-assignment-properties"
           }
         },
-        "outputs": {
-          "meshed-template": {
-            "type": "json",
-            "value": {
-              "get_attribute": [
-                "resource-assignment",
-                "assignment-params"
-              ]
+        "outputs" : {
+          "meshed-template" : {
+            "type" : "json",
+            "value" : {
+              "get_attribute" : [ "resource-assignment", "assignment-params" ]
             }
           }
         }
       },
-      "config-assign": {
-        "steps": {
-          "config-assign": {
-            "description": "Config Assign Workflow",
-            "target": "config-assign",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "config-assign" : {
+        "steps" : {
+          "config-assign" : {
+            "description" : "Config Assign Workflow",
+            "target" : "config-assign",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": true,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : true,
+            "type" : "string"
           },
-          "config-assign-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(config-assign).",
-            "required": true,
-            "type": "dt-config-assign-properties"
+          "config-assign-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(config-assign).",
+            "required" : true,
+            "type" : "dt-config-assign-properties"
           }
         },
-        "outputs": {
-          "dry-run": {
-            "type": "json",
-            "value": {
-              "get_attribute": [
-                "config-assign",
-                "assignment-params"
-              ]
+        "outputs" : {
+          "dry-run" : {
+            "type" : "json",
+            "value" : {
+              "get_attribute" : [ "config-assign", "assignment-params" ]
             }
           }
         }
       },
-      "config-deploy": {
-        "steps": {
-          "config-deploy": {
-            "description": "Resource Assign and Python Netconf Activation Workflow",
-            "target": "config-deploy",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "config-deploy" : {
+        "steps" : {
+          "config-deploy" : {
+            "description" : "Resource Assign and Python Netconf Activation Workflow",
+            "target" : "config-deploy",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": false,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : false,
+            "type" : "string"
           },
-          "password": {
-            "required": true,
-            "type": "string"
+          "password" : {
+            "required" : true,
+            "type" : "string"
           },
-          "username": {
-            "required": true,
-            "type": "string"
+          "username" : {
+            "required" : true,
+            "type" : "string"
           },
-          "ip": {
-            "required": true,
-            "type": "string"
+          "ip" : {
+            "required" : true,
+            "type" : "string"
           }
         }
       },
-      "rollback": {
-        "steps": {
-          "rollback": {
-            "description": "Rollback Workflow",
-            "target": "rollback",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "rollback" : {
+        "steps" : {
+          "rollback" : {
+            "description" : "Rollback Workflow",
+            "target" : "rollback",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": false,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : false,
+            "type" : "string"
           },
-          "password": {
-            "required": true,
-            "type": "string"
+          "password" : {
+            "required" : true,
+            "type" : "string"
           },
-          "username": {
-            "required": true,
-            "type": "string"
+          "username" : {
+            "required" : true,
+            "type" : "string"
           },
-          "ip": {
-            "required": true,
-            "type": "string"
+          "ip" : {
+            "required" : true,
+            "type" : "string"
           },
-          "rollback-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(rollback).",
-            "required": true,
-            "type": "dt-rollback-properties"
+          "rollback-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(rollback).",
+            "required" : true,
+            "type" : "dt-rollback-properties"
           }
         }
       }
     },
-    "node_templates": {
-      "resource-assignment": {
-        "type": "component-resource-resolution",
-        "interfaces": {
-          "ResourceResolutionComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "artifact-prefix-names": [
-                    "vf-module-1"
-                  ]
+    "node_templates" : {
+      "resource-assignment" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "artifact-prefix-names" : [ "vf-module-1" ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "vf-module-1-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vf-module-1-template.vtl"
+        "artifacts" : {
+          "vf-module-1-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/vf-module-1-template.vtl"
           },
-          "vf-module-1-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vf-module-1-mapping.json"
+          "vf-module-1-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/vf-module-1-mapping.json"
           }
         }
       },
-      "config-assign": {
-        "type": "component-resource-resolution",
-        "interfaces": {
-          "ResourceResolutionComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "resolution-key": {
-                    "get_input": "resolution-key"
+      "config-assign" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "resolution-key" : {
+                    "get_input" : "resolution-key"
                   },
-                  "store-result": true,
-                  "artifact-prefix-names": [
-                    "hostname", "vfw-interface"
-                  ]
+                  "store-result" : true,
+                  "artifact-prefix-names" : [ "hostname", "vfw-interface" ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "hostname-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/hostname-template.vtl"
+        "artifacts" : {
+          "hostname-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/hostname-template.vtl"
           },
-          "hostname-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/hostname-mapping.json"
+          "hostname-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/hostname-mapping.json"
           },
-          "vfw-interface-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vfw-interface-template.vtl"
+          "vfw-interface-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/vfw-interface-template.vtl"
           },
-          "vfw-interface-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vfw-interface-mapping.json"
+          "vfw-interface-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/vfw-interface-mapping.json"
           }
         }
       },
-      "config-deploy": {
-        "type": "component-netconf-executor",
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
+      "config-deploy" : {
+        "type" : "component-netconf-executor",
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
           }
         },
-        "interfaces": {
-          "ComponentNetconfExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "script-type": "jython",
-                  "script-class-reference": "Scripts/python/ConfigDeploy.py",
-                  "instance-dependencies": [],
-                  "dynamic-properties": "*config-deploy-properties"
+        "interfaces" : {
+          "ComponentNetconfExecutor" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "script-type" : "jython",
+                  "script-class-reference" : "Scripts/python/ConfigDeploy.py",
+                  "instance-dependencies" : [ ],
+                  "dynamic-properties" : "*config-deploy-properties"
                 }
               }
             }
           }
         }
       },
-      "rollback": {
-        "type": "component-netconf-executor",
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
+      "rollback" : {
+        "type" : "component-netconf-executor",
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
           }
         },
-        "interfaces": {
-          "ComponentNetconfExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "script-type": "jython",
-                  "script-class-reference": "Scripts/python/Rollback.py",
-                  "instance-dependencies": []
+        "interfaces" : {
+          "ComponentNetconfExecutor" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "script-type" : "jython",
+                  "script-class-reference" : "Scripts/python/Rollback.py",
+                  "instance-dependencies" : [ ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "junos-rollback-RPC-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/junos-rollback-RPC-template.vtl"
+        "artifacts" : {
+          "junos-rollback-RPC-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/junos-rollback-RPC-template.vtl"
           },
-          "junos-rollback-RPC-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/junos-rollback-RPC-mapping.json"
+          "junos-rollback-RPC-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/junos-rollback-RPC-mapping.json"
           }
         }
       },
-      "netconf-device": {
-        "type": "vnf-netconf-device",
-        "capabilities": {
-          "netconf": {
-            "properties": {
-              "login-key": {
-                "get_input": "password"
+      "netconf-device" : {
+        "type" : "vnf-netconf-device",
+        "capabilities" : {
+          "netconf" : {
+            "properties" : {
+              "login-key" : {
+                "get_input" : "password"
               },
-              "login-account": {
-                "get_input": "username"
+              "login-account" : {
+                "get_input" : "username"
               },
-              "target-ip-address": {
-                "get_input": "ip"
+              "target-ip-address" : {
+                "get_input" : "ip"
               },
-              "port-number": 830,
-              "connection-time-out": 5
+              "port-number" : 830,
+              "connection-time-out" : 5
             }
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
index c1cded2..80ae5d7 100644 (file)
@@ -3,6 +3,12 @@
     "component-netconf-executor" : {
       "description" : "This is Netconf Transaction Configuration Component API",
       "version" : "1.0.0",
+      "attributes" : {
+        "response-data" : {
+          "required" : false,
+          "type" : "json"
+        }
+      },
       "capabilities" : {
         "component-node" : {
           "type" : "tosca.capabilities.Node"
                   } ],
                   "default" : "internal"
                 },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                },
                 "script-class-reference" : {
                   "description" : "Kotlin Script class name or jython script name.",
                   "required" : true,
                   "entry_schema" : {
                     "type" : "string"
                   }
+                },
+                "dynamic-properties" : {
+                  "description" : "Dynamic Json Content or DSL Json reference.",
+                  "required" : false,
+                  "type" : "json"
                 }
               },
               "outputs" : {
                   "required" : false,
                   "type" : "string"
                 },
+                "occurrence" : {
+                  "description" : "Number of time to perform the resolution.",
+                  "required" : false,
+                  "type" : "integer",
+                  "default" : 1
+                },
                 "store-result" : {
                   "description" : "Whether or not to store the output.",
                   "required" : false,
       },
       "derived_from" : "tosca.nodes.Component"
     },
-    "dg-generic" : {
-      "description" : "This is Generic Directed Graph Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "content" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "dependency-node-templates" : {
-          "description" : "Dependent Step Components NodeTemplate name.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Workflow"
-    },
     "source-capability" : {
       "description" : "This is Component Resource Source Node Type",
       "version" : "1.0.0",
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-default" : {
-      "description" : "This is Default Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "SQL", "PLSQL" ]
-          } ]
+          } ],
+          "default" : "SQL"
         },
         "endpoint-selector" : {
           "required" : false,
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
+    "source-default" : {
+      "description" : "This is Default Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-input" : {
+      "description" : "This is Input Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
     "source-rest" : {
       "description" : "This is Rest Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
         "type" : {
-          "required" : false,
+          "required" : true,
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "JSON" ]
           "default" : "JSON"
         },
         "verb" : {
-          "required" : false,
+          "required" : true,
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.Workflow" : {
-      "description" : "This is Directed Graph Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
     "tosca.nodes.ResourceSource" : {
       "description" : "TOSCA base type for Resource Sources",
       "version" : "1.0.0",
index 1169a8d..73ee861 100644 (file)
@@ -8,7 +8,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
       }
     }
   },
+  "golden-vf-module-type" : {
+    "tags" : "golden-vf-module-type",
+    "name" : "golden-vf-module-type",
+    "property" : {
+      "description" : "golden-vf-module-type",
+      "type" : "string"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
+          "input-key-mapping" : {
+            "vfmoduleid" : "vf-module-number"
+          },
+          "output-key-mapping" : {
+            "golden-vf-module-type" : "value"
+          },
+          "key-dependencies" : [ "vf-module-number" ]
+        }
+      }
+    }
+  },
   "hostname" : {
     "tags" : "hostname",
     "name" : "hostname",
@@ -35,7 +60,7 @@
       "description" : "hostname",
       "type" : "string"
     },
-    "updated-by" : "adetalhouet",
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
         "type" : "source-input"
         "properties" : { }
       }
     }
-  },
-  "vf-module-type" : {
-    "tags" : "vf-module-type",
-    "name" : "vf-module-type",
-    "property" : {
-      "description" : "vf-module-type",
-      "type" : "string"
-    },
-    "updated-by" : "adetalhouet",
-    "sources" : {
-      "processor-db" : {
-        "type" : "source-processor-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
-          "input-key-mapping" : {
-            "vfmoduleid" : "vf-module-number"
-          },
-          "output-key-mapping" : {
-            "vf-module-type" : "value"
-          },
-          "key-dependencies" : [ "vf-module-number" ]
-        }
-      }
-    }
   }
 }
\ No newline at end of file
index f4fc9ab..738b0d4 100644 (file)
@@ -17,7 +17,7 @@
     "property": {
       "type": "string"
     },
-    "dictionary-name": "vf-module-type",
+    "dictionary-name": "golden-vf-module-type",
     "dictionary-source": "processor-db",
     "dependencies": [
       "vf-module-number"
@@ -33,7 +33,7 @@
     "dictionary-name": "vf-module-number",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -46,7 +46,7 @@
     "dictionary-name": "prefix-id",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -56,9 +56,9 @@
         "type": "dt-netbox-ip"
     },
     "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "prefix-id"
     ]
   }
-]
\ No newline at end of file
+]
index 9de8444..427df73 100644 (file)
@@ -1,88 +1,80 @@
-[
-  {
-    "name": "interface-description",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-description",
-    "dictionary-source": "capability",
-    "dependencies": [
-      "vf-module-type"
-    ]
+[{
+  "name": "interface-description",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "interface-name",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-name",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-description",
+  "dictionary-source": "capability",
+  "dependencies": [
+    "golden-vf-module-type"
+  ]
+}, {
+  "name": "interface-name",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "unit-number",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "unit-number",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-name",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "unit-number",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "prefix-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "6"
-    },
-    "dictionary-name": "prefix-id",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "unit-number",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "prefix-id",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "6"
   },
-  {
-    "name": "vf-module-type",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-number"
-    ]
+  "dictionary-name": "prefix-id",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "golden-vf-module-type",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "vf-module-number",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "3"
-    },
-    "dictionary-name": "vf-module-number",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "golden-vf-module-type",
+  "dictionary-source": "processor-db",
+  "dependencies": [
+    "vf-module-number"
+  ]
+}, {
+  "name": "vf-module-number",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "3"
   },
-  {
-    "name": "vfw_interface_ip",
-    "input-param": true,
-    "property": {
-        "type": "dt-netbox-ip"
-    },
-    "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
-    "dependencies": [
-      "prefix-id"
-    ]
-  }
-]
\ No newline at end of file
+  "dictionary-name": "vf-module-number",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "vfw_interface_ip",
+  "input-param": true,
+  "property": {
+    "type": "dt-netbox-ip"
+  },
+  "dictionary-name": "create_netbox_ip",
+  "dictionary-source": "config-data",
+  "dependencies": [
+    "prefix-id"
+  ]
+}]
index adb8bd4..9a63905 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/create_netbox_ip.json
new file mode 100644 (file)
index 0000000..fea6862
--- /dev/null
@@ -0,0 +1,29 @@
+{
+    "tags" : "oam-local-ipv4-address",
+    "name" : "create_netbox_ip",
+    "property" : {
+      "description" : "netbox ip",
+      "type" : "dt-netbox-ip"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "verb" : "POST",
+          "endpoint-selector" : "ipam-1",
+          "url-path" : "/api/ipam/prefixes/$prefix-id/available-ips/",
+          "path" : "",
+          "input-key-mapping" : {
+            "prefix-id" : "prefix-id"
+          },
+          "output-key-mapping" : {
+            "address" : "address",
+            "id" : "id"
+          },
+          "key-dependencies" : [ "prefix-id" ]
+        }
+      }
+    }
+  }
index 007dc53..9a498d8 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 7b59861..9f40976 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json b/components/model-catalog/resource-dictionary/starter-dictionary/delete_netbox_ip.json
new file mode 100644 (file)
index 0000000..dd14901
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "tags": "oam-local-ipv4-address",
+  "name": "delete_netbox_ip",
+  "property": {
+    "description": "delete netbox ip",
+    "type": "string"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "config-data": {
+      "type": "source-rest",
+      "properties": {
+        "type": "JSON",
+        "verb": "DELETE",
+        "endpoint-selector": "ipam-1",
+        "url-path": "/api/ipam/ip-addresses/$ip-address-id",
+        "path": "/address",
+        "input-key-mapping": {
+          "ip-address-id": "ip-address-id"
+        },
+        "output-key-mapping": {
+
+        },
+        "key-dependencies": [
+          "ip-address-id"
+        ]
+      }
+    }
+  }
+}
index 83ee035..bb18688 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json b/components/model-catalog/resource-dictionary/starter-dictionary/golden-vf-module-type.json
new file mode 100644 (file)
index 0000000..4d33577
--- /dev/null
@@ -0,0 +1,25 @@
+{
+  "tags" : "golden-vf-module-type",
+  "name" : "golden-vf-module-type",
+  "property" : {
+    "description" : "golden-vf-module-type",
+    "type" : "string"
+  },
+  "updated-by" : "adetalhouet",
+  "sources" : {
+    "processor-db" : {
+      "type" : "source-db",
+      "properties" : {
+        "type" : "SQL",
+        "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
+        "input-key-mapping" : {
+          "vfmoduleid" : "vf-module-number"
+        },
+        "output-key-mapping" : {
+          "golden-vf-module-type" : "value"
+        },
+        "key-dependencies" : [ "vf-module-number" ]
+      }
+    }
+  }
+}
index 7a57153..55fbf5e 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 57a0ef3..84a632f 100755 (executable)
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -30,4 +30,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 90bccfb..9e76f28 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 6d65241..fca0128 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index dc81034..892b698 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 9110f03..2bd83e1 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 202a555..8c6d5f8 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json b/components/model-catalog/resource-dictionary/starter-dictionary/interface-description.json
new file mode 100644 (file)
index 0000000..5b3fa44
--- /dev/null
@@ -0,0 +1,19 @@
+{
+  "tags": "interface-description",
+  "name": "interface-description",
+  "property": {
+    "description": "interface-description",
+    "type": "string"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "capability": {
+      "type": "source-capability",
+      "properties": {
+        "script-type": "jython",
+        "script-class-reference": "Scripts/python/DescriptionExample.py",
+        "instance-dependencies": []
+      }
+    }
+  }
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/interface-name.json
new file mode 100644 (file)
index 0000000..53a11ed
--- /dev/null
@@ -0,0 +1,15 @@
+{
+  "name" : "interface-name",
+  "tags" : "interface-name",
+  "updated-by" : "adetalhouet",
+  "property" : {
+    "description" : "interface-name",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : { }
+    }
+  }
+}
\ No newline at end of file
index 6eb8d92..2f80c06 100755 (executable)
@@ -10,7 +10,7 @@
     "input": {
       "type": "source-input"
     },
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -30,4 +30,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 03109ab..af84802 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 751e993..486abfd 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,7 +34,7 @@
       }\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -46,4 +46,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index ee67b92..c783cac 100755 (executable)
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index a4e6c11..336399b 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 3709c0b..0af32e1 100755 (executable)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index a26b82f..90f5b49 100755 (executable)
@@ -13,7 +13,7 @@
       }
     },
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 4cc28dc..ba74e2d 100755 (executable)
@@ -15,7 +15,7 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -32,4 +32,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 90d674c..85c2e60 100755 (executable)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,7 +34,7 @@
       }\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -46,4 +46,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index c805e32..37691e3 100755 (executable)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,4 @@
         }\r
       }\r
     \r
-  }
\ No newline at end of file
+  }\r
index 80f62ea..0f6b55e 100755 (executable)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index d1a4b79..2d58eb3 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 6210bf9..d67ede5 100644 (file)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,7 +35,7 @@
         },\r
       \r
       "processor-db": {\r
-        "type": "source-processor-db",\r
+        "type": "source-db",\r
         "properties": {\r
           "endpoint-selector": "dynamic-db-source",\r
           "type": "SQL",\r
@@ -48,4 +48,3 @@
       }\r
     }\r
   }\r
\ No newline at end of file
index a819388..7ac8bc8 100644 (file)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,3 @@
         }\r
       }\r
     }\r
-  
\ No newline at end of file
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/prefix-id.json
new file mode 100644 (file)
index 0000000..e515eca
--- /dev/null
@@ -0,0 +1,16 @@
+{
+  "tags": "prefix-id",
+  "name": "prefix-id",
+  "property" :{
+    "description": "prefix-id",
+    "type": "integer"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    }
+  }
+}
\ No newline at end of file
index 31ab6a9..de90ab9 100755 (executable)
@@ -15,7 +15,7 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -27,4 +27,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 7eff98d..ec52973 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,7 +34,7 @@
       }\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -46,4 +46,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index f3f0ae1..83d91c3 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,7 +34,7 @@
       }\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -46,4 +46,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 8ddf987..dc6af51 100755 (executable)
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index ac12ad2..62fc05d 100755 (executable)
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"protected\"",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index 441a3c8..3c8f133 100755 (executable)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 7c27413..1242e10 100755 (executable)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,4 @@
         }\r
       }\r
     \r
-  }
\ No newline at end of file
+  }\r
@@ -1,24 +1,24 @@
-{\r
-  "name": "sample-db-source",\r
-  "property" :{\r
-    "description": "name of the ",\r
-    "type": "string"\r
-  },\r
-  "updated-by": "brindasanth@onap.com",\r
-  "tags": "processor-db-source, brindasanth@onap.com",\r
-  "sources": {\r
-    "processor-db": {\r
-      "type": "source-processor-db",\r
-      "properties": {\r
-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",\r
-        "input-key-mapping": {\r
-          "profile_name": "profile_name"\r
-        },\r
-        "output-key-mapping": {\r
-          "db-country": "country",\r
-          "db-state": "state"\r
-        }\r
-      }\r
-    }\r
-  }\r
-}
\ No newline at end of file
+{
+  "name": "sample-db-source",
+  "property" :{
+    "description": "name of the ",
+    "type": "string"
+  },
+  "updated-by": "brindasanth@onap.com",
+  "tags": "processor-db, brindasanth@onap.com",
+  "sources": {
+    "processor-db": {
+      "type": "source-db",
+      "properties": {
+        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+        "input-key-mapping": {
+          "profile_name": "profile_name"
+        },
+        "output-key-mapping": {
+          "db-country": "country",
+          "db-state": "state"
+        }
+      }
+    }
+  }
+}
index c0f78ac..86a8e5d 100644 (file)
@@ -11,7 +11,7 @@
   },\r
   "updated-by": "brindasanth@onap.com",\r
   "sources": {\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -26,4 +26,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 75d7ca0..22d3da5 100644 (file)
@@ -7,7 +7,7 @@
   },\r
   "updated-by": "brindasanth@onap.com",\r
   "sources": {\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -22,4 +22,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 14437c9..50776c1 100755 (executable)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,4 @@
         }\r
       }\r
     \r
-  }
\ No newline at end of file
+  }\r
index 4aa0223..f78771a 100755 (executable)
@@ -12,7 +12,7 @@
       "properties" : { }
     },
     "any-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
         "input-key-mapping": {
@@ -23,7 +23,7 @@
       }
     },
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
         "input-key-mapping": {
@@ -42,4 +42,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json b/components/model-catalog/resource-dictionary/starter-dictionary/unit-number.json
new file mode 100644 (file)
index 0000000..333fd78
--- /dev/null
@@ -0,0 +1,14 @@
+{
+    "tags": "unit-number",
+    "name": "unit-number",
+    "property": {
+      "description": "unit-number",
+      "type": "string"
+    },
+    "updated-by": "adetalhouet",
+    "sources": {
+      "input": {
+        "type": "source-input"
+      }
+    }
+  }
\ No newline at end of file
index 7d3475d..895d31c 100755 (executable)
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index 60b846d..ff68a19 100755 (executable)
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"unprotected\"",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index 323c33e..d1c2c6c 100644 (file)
@@ -15,7 +15,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -36,4 +36,4 @@
         }\r
       }\r
     \r
-  }
\ No newline at end of file
+  }\r
index bc70891..4ab006f 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 715cbc7..a9c5047 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index c02e09d..5145cc6 100644 (file)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,4 @@
         }\r
       }\r
     \r
-  }
\ No newline at end of file
+  }\r
index 420df6a..17cee31 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 5e5f071..6f268ab 100755 (executable)
@@ -15,9 +15,8 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-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
@@ -32,4 +31,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-number.json
new file mode 100644 (file)
index 0000000..cdd40f6
--- /dev/null
@@ -0,0 +1,16 @@
+{
+  "tags": "vf-module-number",
+  "name": "vf-module-number",
+  "property" :{
+    "description": "vf-module-number",
+    "type": "string"
+  },
+  "updated-by": "adetalhouet",
+  "sources": {
+    "default": {
+      "type": "source-default",
+      "properties": {
+      }
+    }
+  }
+}
\ No newline at end of file
index f970682..1e95963 100755 (executable)
@@ -15,9 +15,8 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-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
@@ -32,4 +31,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index cae1117..6c9639c 100755 (executable)
@@ -13,7 +13,7 @@
       }
     },
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 2f839ac..1bf36ef 100755 (executable)
@@ -8,7 +8,7 @@
   },
   "sources" : {
     "processor-db" : {
-      "type" : "source-processor-db",
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 1f8c1d2..8cf1838 100755 (executable)
@@ -15,7 +15,7 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -32,4 +32,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 4c227f9..b955454 100755 (executable)
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
index 0df08c0..2472590 100755 (executable)
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
index cbc0c5b..82a5835 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 74fae46..b693147 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index c1bdb60..9b9dceb 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index e04697f..d174df7 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 99448b8..9de05ea 100644 (file)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,3 @@
         }\r
       }\r
     }\r
-  
\ No newline at end of file
index 9c0855b..f75eb1b 100644 (file)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,4 @@
         }\r
       }\r
     \r
-  }
\ No newline at end of file
+  }\r
index 4be4c82..dcbedfe 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 5a38f92..94dbc84 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 3cda767..00b8aaa 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,7 +34,7 @@
       }\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -46,4 +46,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 563dd45..8cccda4 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 58e7105..7c3ac08 100755 (executable)
@@ -15,7 +15,7 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -32,4 +32,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index f179957..2a4908a 100755 (executable)
@@ -14,7 +14,7 @@
           "type": "source-default",\r
           "properties": {}\r
         },\r
-        "primary-config-data": {\r
+        "config-data": {\r
           "type": "source-rest",\r
           "properties": {\r
             "type": "JSON",\r
@@ -35,4 +35,3 @@
         }\r
       }\r
     }\r
-  
\ No newline at end of file
index 09b7380..d16b7b9 100755 (executable)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -33,7 +33,7 @@
         ]\r
       }\r
     },\r
-    "primary-aai-data": {\r
+    "aai-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -52,4 +52,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 2174914..b4486e8 100755 (executable)
@@ -17,7 +17,7 @@
       "properties": {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
index 855ca22..da4bc65 100755 (executable)
@@ -15,7 +15,7 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -32,4 +32,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index b6027fe..1f85487 100755 (executable)
@@ -15,7 +15,7 @@
       "properties": {}\r
     },\r
     "processor-db": {\r
-      "type": "source-processor-db",\r
+      "type": "source-db",\r
       "properties": {\r
         "endpoint-selector": "dynamic-db-source",\r
         "type": "SQL",\r
@@ -32,4 +32,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 6a4b1bc..1e64894 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index cfeab71..c7e2671 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index d35cc1e..6a823bf 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index b6865ac..66a9daa 100644 (file)
@@ -14,7 +14,7 @@
       "type": "source-default",\r
       "properties": {}\r
     },\r
-    "primary-config-data": {\r
+    "config-data": {\r
       "type": "source-rest",\r
       "properties": {\r
         "type": "JSON",\r
@@ -34,4 +34,4 @@
       }\r
     }\r
   }\r
-}
\ No newline at end of file
+}\r
index 586aa0c..85706f2 100755 (executable)
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
index 1fe4797..a7ad5fb 100755 (executable)
@@ -12,7 +12,7 @@
       "properties" : {
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
index 297a8ef..fea6862 100644 (file)
@@ -7,7 +7,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -26,4 +26,4 @@
         }
       }
     }
-  }
\ No newline at end of file
+  }
index 35a8a35..dd14901 100644 (file)
@@ -7,7 +7,7 @@
   },
   "updated-by": "adetalhouet",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 9e8c409..3586443 100644 (file)
@@ -8,7 +8,7 @@
   "updated-by": "adetalhouet",
   "sources": {
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "type": "SQL",
         "query": "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
@@ -24,4 +24,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index f17ddb4..f6d83c5 100644 (file)
@@ -5,35 +5,32 @@
 create_netbox_ip_address code
 =============================
 
-.. code-block:: json
-   :linenos:
-   
-   {
-       "tags" : "oam-local-ipv4-address",
-       "name" : "create_netbox_ip",
-       "property" : {
-         "description" : "netbox ip",
-         "type" : "dt-netbox-ip"
-       },
-       "updated-by" : "adetalhouet",
-       "sources" : {
-         "primary-config-data" : {
-           "type" : "source-rest",
-           "properties" : {
-             "type" : "JSON",
-             "verb" : "POST",
-             "endpoint-selector" : "ipam-1",
-             "url-path" : "/api/ipam/prefixes/$prefixId/available-ips/",
-             "path" : "",
-             "input-key-mapping" : {
-               "prefixId" : "prefix-id"
-             },
-             "output-key-mapping" : {
-               "address" : "address",
-               "id" : "id"
-             },
-             "key-dependencies" : [ "prefix-id" ]
-           }
-         }
-       }
-   }
\ No newline at end of file
+{
+    "tags" : "oam-local-ipv4-address",
+    "name" : "create_netbox_ip",
+    "property" : {
+      "description" : "netbox ip",
+      "type" : "dt-netbox-ip"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "config-data" : {
+        "type" : "source-rest",
+        "properties" : {
+          "type" : "JSON",
+          "verb" : "POST",
+          "endpoint-selector" : "ipam-1",
+          "url-path" : "/api/ipam/prefixes/$prefixId/available-ips/",
+          "path" : "",
+          "input-key-mapping" : {
+            "prefixId" : "prefix-id"
+          },
+          "output-key-mapping" : {
+            "address" : "address",
+            "id" : "id"
+          },
+          "key-dependencies" : [ "prefix-id" ]
+        }
+      }
+    }
+  }
index 16e5b32..3405eda 100755 (executable)
@@ -26,7 +26,7 @@ server.port=8081
 
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=blueprints/deploy
@@ -67,14 +67,14 @@ blueprintsprocessor.blueprintDeployPath=blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=blueprints/work
 # Primary Database Configuration
-blueprintsprocessor.db.primary.url=jdbc:mysql://localhost:3306/sdnctl
-blueprintsprocessor.db.primary.username=sdnctl
-blueprintsprocessor.db.primary.password=sdnctl
-blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=update
-blueprintsprocessor.db.primary.hibernateDDLAuto=none
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
+blueprintsprocessor.db.url=jdbc:mysql://localhost:3306/sdnctl
+blueprintsprocessor.db.username=sdnctl
+blueprintsprocessor.db.password=sdnctl
+blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=update
+blueprintsprocessor.db.hibernateDDLAuto=none
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Python executor
 ### If testing in docker, use the absolute paths as Docker view of filesystem will not respect relative paths.
index bc297ef..3ea588d 100755 (executable)
@@ -16,7 +16,7 @@
 # Web server config
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@ -48,14 +48,14 @@ blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/working
 
 # Primary Database Configuration
-blueprintsprocessor.db.primary.url=jdbc:mysql://db:3306/sdnctl
-blueprintsprocessor.db.primary.username=sdnctl
-blueprintsprocessor.db.primary.password=sdnctl
-blueprintsprocessor.db.primary.driverClassName=org.mariadb.jdbc.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=update
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
+blueprintsprocessor.db.url=jdbc:mysql://db:3306/sdnctl
+blueprintsprocessor.db.username=sdnctl
+blueprintsprocessor.db.password=sdnctl
+blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=update
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Python executor
 blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
@@ -85,16 +85,16 @@ blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXB
 
 
 # Primary Config Data REST client settings
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://sdnc:8282
-blueprintsprocessor.restclient.primary-config-data.username=admin
-blueprintsprocessor.restclient.primary-config-data.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://sdnc:8282
+blueprintsprocessor.restclient.config-data.username=admin
+blueprintsprocessor.restclient.config-data.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 
 # Primary AAI Data REST Client settings
-blueprintsprocessor.restclient.primary-aai-data.type=basic-auth
-blueprintsprocessor.restclient.primary-aai-data.url=https://aai.onap:8443
-blueprintsprocessor.restclient.primary-aai-data.username=aai@aai.onap.org
-blueprintsprocessor.restclient.primary-aai-data.password=demo123456!
+blueprintsprocessor.restclient.aai-data.type=basic-auth
+blueprintsprocessor.restclient.aai-data.url=https://aai.onap:8443
+blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
+blueprintsprocessor.restclient.aai-data.password=demo123456!
 
 # Kafka-message-lib Configuration
 blueprintsprocessor.messageclient.self-service-api.topic=producer.t
index b8b80f2..74c8a23 100644 (file)
@@ -20,14 +20,14 @@ blueprintsprocessor.httpPort=0
 blueprintsprocessor.grpcEnable=true
 blueprintsprocessor.grpcPort=0
 
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;MODE=MySQL;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 
 # The properties bellow are set programmatically
 #blueprintsprocessor.blueprintDeployPath=
@@ -47,4 +47,4 @@ blueprints.processor.functions.python.executor.modulePaths=\
 blueprintsprocessor.cliExecutor.enabled=true
 blueprintprocessor.netconfExecutor.enabled=true
 
-blueprintsprocessor.restconfEnabled=true
\ No newline at end of file
+blueprintsprocessor.restconfEnabled=true
index 06f3e94..e50ebde 100644 (file)
@@ -19,7 +19,7 @@
 server.port=8080
 ### START -Controller Blueprints Properties
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/opt/app/onap/blueprints/deploy
@@ -49,14 +49,14 @@ blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/work
 # Primary Database Configuration
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Python executor
 blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
 blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints
index 1e19744..848083e 100755 (executable)
@@ -14,17 +14,3 @@ services:
       MYSQL_DATABASE: sdnctl\r
       MYSQL_USER: sdnctl\r
       MYSQL_PASSWORD: sdnctl\r
-  blueprints-processor:\r
-    depends_on:\r
-    - db\r
-    image: onap/ccsdk-blueprintsprocessor:latest\r
-    container_name: bp-rest\r
-    ports:\r
-    - "8000:8080"\r
-    restart: always\r
-    environment:\r
-      APPLICATIONNAME: BlueprintsProcessor\r
-      BUNDLEVERSION: 1.0.0\r
-      APP_CONFIG_HOME: /opt/app/onap/config\r
-      STICKYSELECTORKEY:\r
-      ENVCONTEXT: dev
\ No newline at end of file
index 527eb8a..2bbe31b 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -32,4 +32,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
\ No newline at end of file
+blueprintprocessor.netconfExecutor.enabled=true
index ce5b4e3..74c478a 100644 (file)
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -29,4 +29,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
\ No newline at end of file
+blueprintprocessor.netconfExecutor.enabled=true
index 527eb8a..2bbe31b 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -32,4 +32,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
\ No newline at end of file
+blueprintprocessor.netconfExecutor.enabled=true
index f8193b7..6645a63 100644 (file)
@@ -123,12 +123,16 @@ open class DatabaseResourceAssignmentProcessor(private val bluePrintDBLibPropert
         checkNotEmpty(resourceAssignment.dictionaryName) {
             "resource assignment dictionary name is not defined for template key (${resourceAssignment.name})"
         }
-        check(resourceAssignment.dictionarySource in arrayOf(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, ResourceDictionaryConstants.SOURCE_PRIMARY_DB))
+        check(resourceAssignment.dictionarySource in getListOfDBSources())
         {
-            "resource assignment source is not ${ResourceDictionaryConstants.SOURCE_PROCESSOR_DB} but it is ${resourceAssignment.dictionarySource}"
+            "resource assignment source is not ${ResourceDictionaryConstants.PROCESSOR_DB} but it is ${resourceAssignment.dictionarySource}"
         }
     }
 
+    //placeholder to get the list of DB sources.
+    //TODO: This will be replaced with a DB
+    private fun getListOfDBSources(): Array<String> =  arrayOf(ResourceDictionaryConstants.PROCESSOR_DB)
+
     private fun populateNamedParameter(inputKeyMapping: Map<String, String>): Map<String, Any> {
         val namedParameters = HashMap<String, Any>()
         inputKeyMapping.forEach {
@@ -163,4 +167,4 @@ open class DatabaseResourceAssignmentProcessor(private val bluePrintDBLibPropert
     override suspend fun recoverNB(runtimeException: RuntimeException, resourceAssignment: ResourceAssignment) {
         raRuntimeService.getBluePrintError().addError(runtimeException.message!!)
     }
-}
\ No newline at end of file
+}
index 7e7e656..9c6aae2 100644 (file)
@@ -73,7 +73,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-name"
                 dictionaryName = "vnf_name"
-                dictionarySource = "primary-config-data"
+                dictionarySource = "config-data"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
@@ -106,7 +106,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-aai"
                 dictionaryName = "aai-get-resource"
-                dictionarySource = "primary-aai-data"
+                dictionarySource = "aai-data"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
@@ -139,7 +139,7 @@ class RestResourceResolutionProcessorTest {
             val resourceAssignment = ResourceAssignment().apply {
                 name = "rr-aai"
                 dictionaryName = "aai-put-resource"
-                dictionarySource = "primary-aai-data"
+                dictionarySource = "aai-data"
                 property = PropertyDefinition().apply {
                     type = "string"
                 }
@@ -150,4 +150,4 @@ class RestResourceResolutionProcessorTest {
             println(processorName)
         }
     }
-}
\ No newline at end of file
+}
index 5deea31..3218a58 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
@@ -30,12 +30,12 @@ blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
 blueprints.processor.functions.python.executor.executionPath=./../../../../components/scripts/python/ccsdk_blueprints
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9911
-blueprintsprocessor.restclient.primary-config-data.username=sampleuser
-blueprintsprocessor.restclient.primary-config-data.password=sampletoken
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9911
+blueprintsprocessor.restclient.config-data.username=sampleuser
+blueprintsprocessor.restclient.config-data.password=sampletoken
 
-blueprintsprocessor.restclient.primary-aai-data.type=basic-auth
-blueprintsprocessor.restclient.primary-aai-data.url=http://127.0.0.1:30800
-blueprintsprocessor.restclient.primary-aai-data.username=admin
-blueprintsprocessor.restclient.primary-aai-data.password=aaiTest
\ No newline at end of file
+blueprintsprocessor.restclient.aai-data.type=basic-auth
+blueprintsprocessor.restclient.aai-data.url=http://127.0.0.1:30800
+blueprintsprocessor.restclient.aai-data.username=admin
+blueprintsprocessor.restclient.aai-data.password=aaiTest
@@ -1,15 +1,15 @@
-{\r
-       "version": "1.0.0",\r
-       "description": "test Data Type",\r
-       "properties": {\r
-               "country": {\r
-                       "required": true,\r
-                       "type": "string"\r
-               },\r
-               "state": {\r
-                       "required": false,\r
-                       "type": "string"\r
-               }\r
-       },\r
-       "derived_from": "tosca.datatypes.Root"\r
-}\r
+{
+       "version": "1.0.0",
+       "description": "test Data Type",
+       "properties": {
+               "country": {
+                       "required": true,
+                       "type": "string"
+               },
+               "state": {
+                       "required": false,
+                       "type": "string"
+               }
+       },
+       "derived_from": "tosca.datatypes.Root"
+}
@@ -1,35 +1,35 @@
-{\r
-       "locations": {\r
-               "name": "locations",\r
-               "data-type": "list",\r
-               "entry-schema": "dt-location",\r
-               "source": {\r
-                       "primary-db": {\r
-                               "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",\r
-                               "input-key-mapping": {\r
-                                       "profile_name": "profile_name"\r
-                               },\r
-                               "output-key-mapping": {\r
-                                       "db-country": "country",\r
-                                       "db-state": "state"\r
-                               }\r
-                       }\r
-               },\r
-               "candidate-dependency": {\r
-                       "primary-db": {\r
-                               "names": [\r
-                                       "profile_name"\r
-                               ]\r
-                       }\r
-               }\r
-       },\r
-       "profile_name": {\r
-               "name": "profile_name",\r
-               "data-type": "string",\r
-               "source": {\r
-                       "input": {\r
-                               \r
-                       }\r
-               }\r
-       }\r
-}\r
+{
+       "locations": {
+               "name": "locations",
+               "data-type": "list",
+               "entry-schema": "dt-location",
+               "source": {
+                       "processor-db": {
+                               "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+                               "input-key-mapping": {
+                                       "profile_name": "profile_name"
+                               },
+                               "output-key-mapping": {
+                                       "db-country": "country",
+                                       "db-state": "state"
+                               }
+                       }
+               },
+               "candidate-dependency": {
+                       "processor-db": {
+                               "names": [
+                                       "profile_name"
+                               ]
+                       }
+               }
+       },
+       "profile_name": {
+               "name": "profile_name",
+               "data-type": "string",
+               "source": {
+                       "input": {
+                               
+                       }
+               }
+       }
+}
@@ -1,27 +1,27 @@
-{\r
-       "location": {\r
-               "name": "location",\r
-               "data-type": "dt-location",\r
-               "source": {\r
-                       "primary-db": {\r
-                               "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",\r
-                               "input-key-mapping": {\r
-                                       "profile_name": "profile_name"\r
-                               },\r
-                               "output-key-mapping": {\r
-                                       "db-country": "country",\r
-                                       "db-state": "state"\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "profile_name": {\r
-               "name": "profile_name",\r
-               "data-type": "string",\r
-               "source": {\r
-                       "input": {\r
-                               \r
-                       }\r
-               }\r
-       }\r
-}\r
+{
+       "location": {
+               "name": "location",
+               "data-type": "dt-location",
+               "source": {
+                       "processor-db": {
+                               "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+                               "input-key-mapping": {
+                                       "profile_name": "profile_name"
+                               },
+                               "output-key-mapping": {
+                                       "db-country": "country",
+                                       "db-state": "state"
+                               }
+                       }
+               }
+       },
+       "profile_name": {
+               "name": "profile_name",
+               "data-type": "string",
+               "source": {
+                       "input": {
+                               
+                       }
+               }
+       }
+}
@@ -1,26 +1,26 @@
-{\r
-       "country": {\r
-               "name": "country",\r
-               "data-type": "string",\r
-               "source": {\r
-                       "primary-db": {\r
-                               "query": "SELECT country FROM DEVICE_PROFILE WHERE profile_name = :profile_name",\r
-                               "input-key-mapping": {\r
-                                       "profile_name": "profile_name"\r
-                               },\r
-                               "output-key-mapping": {\r
-                                       "country": "country"\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "profile_name": {\r
-               "name": "profile_name",\r
-               "data-type": "string",\r
-               "source": {\r
-                       "input": {\r
-                               \r
-                       }\r
-               }\r
-       }\r
-}\r
+{
+       "country": {
+               "name": "country",
+               "data-type": "string",
+               "source": {
+                       "processor-db": {
+                               "query": "SELECT country FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
+                               "input-key-mapping": {
+                                       "profile_name": "profile_name"
+                               },
+                               "output-key-mapping": {
+                                       "country": "country"
+                               }
+                       }
+               }
+       },
+       "profile_name": {
+               "name": "profile_name",
+               "data-type": "string",
+               "source": {
+                       "input": {
+                               
+                       }
+               }
+       }
+}
@@ -1,22 +1,22 @@
-[\r
-  {\r
-    "name": "country",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "country",\r
-    "dictionary-source": "primary-db",\r
-    "dependencies": ["state"]\r
-  },\r
-  {\r
-    "name": "state",\r
-    "input-param": true,\r
-    "property": {\r
-      "type": "string"\r
-    },\r
-    "dictionary-name": "state",\r
-    "dictionary-source": "input",\r
-    "dependencies": []\r
-  }\r
-]\r
+[
+  {
+    "name": "country",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "country",
+    "dictionary-source": "processor-db",
+    "dependencies": ["state"]
+  },
+  {
+    "name": "state",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "state",
+    "dictionary-source": "input",
+    "dependencies": []
+  }
+]
index 6d8b62f..60c6fef 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
index fd889bf..11abf7b 100644 (file)
@@ -32,7 +32,7 @@ open class BluePrintDBLibConfiguration(private var bluePrintProperties: BluePrin
 
     @Bean("primary-database-properties")
     open fun getPrimaryProperties(): PrimaryDataSourceProperties {
-        return bluePrintProperties.propertyBeanType(DBLibConstants.PREFIX_DB_PRIMARY,
+        return bluePrintProperties.propertyBeanType(DBLibConstants.PREFIX_DB,
                 PrimaryDataSourceProperties::class.java)
     }
 }
@@ -49,11 +49,11 @@ fun BluePrintDependencyService.primaryDBLibGenericService(): BluePrintDBLibGener
 
 class DBLibConstants {
     companion object {
-        const val PREFIX_DB_PRIMARY: String = "blueprintsprocessor.db.primary"
+        const val PREFIX_DB: String = "blueprintsprocessor.db"
 
         //list of database
         const val MARIA_DB: String = "maria-db"
-        const val PRIMARY_DB: String = "primary-db"
+        const val PRIMARY_DB: String = "processor-db"
         const val MYSQL_DB: String = "mysql-db"
         const val ORACLE_DB: String = "oracle-db"
         const val POSTGRES_DB: String = "postgres-db"
@@ -64,4 +64,4 @@ class DBLibConstants {
         const val DRIVER_ORACLE_DB = "oracle.jdbc.driver.OracleDriver"
         const val DRIVER_POSTGRES_DB = "org.postgresql.Driver"
     }
-}
\ No newline at end of file
+}
index 9dda71e..90cf035 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=./target/blueprints/archive
index e02ed89..ebd394c 100644 (file)
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
index ebd5dc8..7d74687 100644 (file)
@@ -1,7 +1,7 @@
 #\r
-# Copyright Â© 2017-2018 AT&T Intellectual Property.\r
+# Copyright ï¿½ 2017-2018 AT&T Intellectual Property.\r
 #\r
-# Modifications Copyright Â© 2019 IBM, Bell Canada.\r
+# Modifications Copyright ï¿½ 2019 IBM, Bell Canada.\r
 #\r
 # Licensed under the Apache License, Version 2.0 (the "License");\r
 # you may not use this file except in compliance with the License.\r
 # See the License for the specific language governing permissions and\r
 # limitations under the License.\r
 #\r
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1\r
-blueprintsprocessor.db.primary.username=sa\r
-blueprintsprocessor.db.primary.password=\r
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver\r
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop\r
-blueprintsprocessor.db.primary.hibernateDDLAuto=update\r
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy\r
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect\r
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1\r
+blueprintsprocessor.db.username=sa\r
+blueprintsprocessor.db.password=\r
+blueprintsprocessor.db.driverClassName=org.h2.Driver\r
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop\r
+blueprintsprocessor.db.hibernateDDLAuto=update\r
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy\r
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect\r
 # Controller Blueprints Core Configuration\r
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy\r
 blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work\r
index 29d4f48..27130a7 100644 (file)
@@ -54,10 +54,10 @@ open class MockResourceSource {
     @Bean(name = [
         "rr-processor-source-input",
         "rr-processor-source-default",
-        "rr-processor-source-processor-db",
+        "rr-processor-source-db",
         "rr-processor-source-rest"])
     open fun sourceInstance(): ResourceAssignmentProcessor {
         return mockk<ResourceAssignmentProcessor>()
     }
 
-}
\ No newline at end of file
+}
index d532b15..ab3bac8 100644 (file)
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-blueprintsprocessor.db.primary.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
-blueprintsprocessor.db.primary.username=sa
-blueprintsprocessor.db.primary.password=
-blueprintsprocessor.db.primary.driverClassName=org.h2.Driver
-blueprintsprocessor.db.primary.hibernateHbm2ddlAuto=create-drop
-blueprintsprocessor.db.primary.hibernateDDLAuto=update
-blueprintsprocessor.db.primary.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
-blueprintsprocessor.db.primary.hibernateDialect=org.hibernate.dialect.H2Dialect
+blueprintsprocessor.db.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1
+blueprintsprocessor.db.username=sa
+blueprintsprocessor.db.password=
+blueprintsprocessor.db.driverClassName=org.h2.Driver
+blueprintsprocessor.db.hibernateHbm2ddlAuto=create-drop
+blueprintsprocessor.db.hibernateDDLAuto=update
+blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
+blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.H2Dialect
 # Controller Blueprints Core Configuration
 blueprintsprocessor.blueprintDeployPath=./target/blueprints/deploy
 blueprintsprocessor.blueprintWorkingPath=./target/blueprints/work
index 09d10dc..1ee8e3f 100755 (executable)
@@ -49,11 +49,11 @@ spring.jpa.hibernate.ddl-auto=none
 spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
-controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy
-controllerblueprints.blueprintArchivePath=/etc/blueprints/archive
-controllerblueprints.blueprintWorkingPath=/etc/blueprints/work
+controllerblueprints.blueprintDeployPath=blueprints/deploy
+controllerblueprints.blueprintArchivePath=blueprints/archive
+controllerblueprints.blueprintWorkingPath=blueprints/work
 # Controller Blueprint Load Configurations
 controllerblueprints.loadInitialData=true
 controllerblueprints.loadBluePrint=false
@@ -67,4 +67,4 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../components/model-cat
 controllerblueprints.loadCbaExtension=zip
 
 # Web server config
-server.port=8080
\ No newline at end of file
+server.port=8082
index 4be06d8..0ccec68 100755 (executable)
@@ -52,7 +52,7 @@ spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=/etc/blueprints/deploy
@@ -72,4 +72,4 @@ controllerblueprints.loadResourceDictionaryPaths=/opt/app/onap//model-catalog/re
 controllerblueprints.loadCbaExtension=zip
 
 # Web server config
-server.port=8080
\ No newline at end of file
+server.port=8080
index 0e96343..0ccd1cf 100755 (executable)
@@ -33,7 +33,7 @@ swagger.contact.url=www.onap.com
 swagger.contact.email=brindasanth@onap.com\r
 \r
 # Load Resource Source Mappings\r
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability\r
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability\r
 \r
 # Controller Blueprints Core Configuration\r
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy\r
@@ -55,4 +55,4 @@ controllerblueprints.loadCbaExtension=zip
 controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint\r
 \r
 # Web server config\r
-server.port=8080
\ No newline at end of file
+server.port=8080\r
index b368c01..99c80f8 100644 (file)
@@ -101,12 +101,12 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) {
 
     fun workflowStepFirstCallOperation(workFlowName: String, stepName: String): String {
         return workflowStepByName(workFlowName, stepName).activities?.filter { it.callOperation != null }?.single()?.callOperation
-                ?: throw BluePrintException("could't get first callOperation for WorkFlow($workFlowName) ")
+                ?: throw BluePrintException("couldn't get first callOperation for WorkFlow($workFlowName) ")
     }
 
     // DSL
     fun dslPropertiesByName(name: String): JsonNode = dslDefinitions()?.get(name)
-            ?: throw BluePrintException("could't get policy type for the dsl($name)")
+            ?: throw BluePrintException("couldn't get policy type for the dsl($name)")
 
     // Data Type
     fun dataTypeByName(name: String): DataType? = dataTypes()?.get(name)
@@ -269,4 +269,4 @@ class BluePrintContext(val serviceTemplate: ServiceTemplate) {
         return BluePrintChainedService(this).nodeTypeChainedProperties(nodeTypeName)
     }
 
-}
\ No newline at end of file
+}
index 73dff93..23b0a17 100644 (file)
@@ -243,7 +243,8 @@ class JacksonUtils {
                 BluePrintConstants.DATA_TYPE_FLOAT,
                 BluePrintConstants.DATA_TYPE_DOUBLE,
                 BluePrintConstants.DATA_TYPE_TIMESTAMP,
-                BluePrintConstants.DATA_TYPE_STRING ->
+                BluePrintConstants.DATA_TYPE_STRING,
+                BluePrintConstants.DATA_TYPE_NULL ->
                     objectNode.set(key, value)
                 else -> throw BluePrintException("populatePrimitiveValues expected only primitive values! Received: ($value)")
             }
@@ -256,7 +257,9 @@ class JacksonUtils {
                 BluePrintConstants.DATA_TYPE_FLOAT,
                 BluePrintConstants.DATA_TYPE_DOUBLE,
                 BluePrintConstants.DATA_TYPE_TIMESTAMP,
-                BluePrintConstants.DATA_TYPE_STRING -> arrayNode.add(value)
+                BluePrintConstants.DATA_TYPE_STRING,
+                BluePrintConstants.DATA_TYPE_NULL ->
+                    arrayNode.add(value)
                 else -> throw BluePrintException("populatePrimitiveValues expected only primitive values! Received: ($value)")
             }
         }
index 0e1f842..e8394a0 100644 (file)
@@ -51,7 +51,7 @@
                                "default": {
                                        "type": "any"
                                },
-                               "primary-aai-data": {
+                               "aai-data": {
                                        "type": "object",
                                        "properties": {
                                                "verb": {
@@ -92,7 +92,7 @@
                                                }
                                        }
                                },
-                               "primary-config-data": {
+                               "config-data": {
                                        "type": "object",
                                        "properties": {
                                                "path": {
                                                }
                                        }
                                },
-                               "primary-db": {
+                               "processor-db": {
                                        "type": "object",
                                        "properties": {
                                                "query": {
                                                }
                                        }
                                },
-                               "primary-aai-data": {
+                               "aai-data": {
                                        "type": "object",
                                        "properties": {
                                                "names": {
                                                }
                                        }
                                },
-                               "primary-config-data": {
+                               "config-data": {
                                        "type": "object",
                                        "properties": {
                                                "names": {
                                                }
                                        }
                                },
-                               "primary-db": {
+                               "processor-db": {
                                        "type": "object",
                                        "properties": {
                                                "names": {
index 67661ec..1600dfa 100644 (file)
@@ -7,7 +7,7 @@
   },
   "updated-by": "brindasanth@onap.com",
   "sources": {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -31,4 +31,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 9b20c1d..51c4596 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_role as vf_model_role from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnfmodelcustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 97d591b..f2450be 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select nfc_naming_code as nfc_naming_code from sdnctl.VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 87448eb..15648ad 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = private",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/primary-db-source.json
deleted file mode 100644 (file)
index 0fd436b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "primary-db-source",
-  "property" :{
-    "description": "name of the ",
-    "type": "string"
-  },
-  "updated-by": "brindasanth@onap.com",
-  "tags": "bundle-id, brindasanth@onap.com",
-  "sources": {
-    "primary-db": {
-      "type": "source-processor-db",
-      "properties": {
-        "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
-        "input-key-mapping": {
-          "profile_name": "profile_name"
-        },
-        "output-key-mapping": {
-          "db-country": "country",
-          "db-state": "state"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
index 5776b1b..38e4ae1 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = private",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
@@ -8,7 +8,7 @@
   "tags": "bundle-id, brindasanth@onap.com",
   "sources": {
     "processor-db": {
-      "type": "source-processor-db",
+      "type": "source-db",
       "properties": {
         "query": "SELECT db-country, db-state FROM DEVICE_PROFILE WHERE profile_name = :profile_name",
         "input-key-mapping": {
@@ -21,4 +21,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index d291715..1ddad09 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = protected",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index bea7f25..badc948 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = protected",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index b4bf22e..2e13567 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = unprotected",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index 362f627..acb379b 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = unprotected",
@@ -18,4 +18,4 @@
          }
     }
   }
-}
\ No newline at end of file
+}
index 0389218..95b78af 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index c06e307..6aa6db1 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vf_module_type as vf_module_type from sdnctl.VF_MODULE_MODEL where customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index e332d3b..df00ba2 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 52359a4..1bf36ef 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODEL.nf_code as vf_nf_code from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:customizationid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index b87473c..bf14f74 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select sdnctl.VF_MODULE_TO_VFC_MAPPING.vfc_customization_uuid as vnf_customid from sdnctl.VF_MODULE_TO_VFC_MAPPING where vm_count = 1 and sdnctl.VF_MODULE_TO_VFC_MAPPING.vf_module_customization_uuid=:vfmodulecustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 59f5151..f1d85fe 100644 (file)
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 6dda72f..de2d81b 100644 (file)
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_1"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index b0d2a01..d67ab1a 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.vm_type as vm_type from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index bcfea9f..991c45f 100644 (file)
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data": {
+    "config-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -26,7 +26,7 @@
         ]
       }
     },
-    "primary-aai-data": {
+    "aai-data": {
       "type": "source-rest",
       "properties": {
         "type": "JSON",
@@ -45,4 +45,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index c90f5b8..ae7413e 100644 (file)
@@ -7,7 +7,7 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -25,4 +25,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 44a5c99..022face 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.invariant_uuid as vfc_invariant_uuid from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 267dea3..02c487c 100644 (file)
@@ -7,8 +7,8 @@
     "type" : "string"
   },
   "sources" : {
-    "primary-db" : {
-      "type" : "source-processor-db",
+    "processor-db" : {
+      "type" : "source-db",
       "properties" : {
         "type" : "SQL",
         "query" : "select vfc_model.version as vnfc_model_version from VFC_MODEL where customization_uuid=:vfccustomizationuuid",
@@ -22,4 +22,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 9bef3c7..bb8b7da 100644 (file)
@@ -13,7 +13,7 @@
         "key" : "vpg_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index 52a4542..4dd0955 100644 (file)
@@ -13,7 +13,7 @@
         "key" : "vsn_private_ip_0"
       }
     },
-    "primary-config-data" : {
+    "config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
@@ -32,4 +32,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
index f83bdae..25b161e 100644 (file)
@@ -24,11 +24,7 @@ package org.onap.ccsdk.cds.controllerblueprints.resource.dict
 object ResourceDictionaryConstants {
     const val SOURCE_INPUT = "input"
     const val SOURCE_DEFAULT = "default"
-    //const val SOURCE_PRIMARY_CONFIG_DATA = "rest"
-    const val SOURCE_PROCESSOR_DB = "processor-db"
-    const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
-    const val SOURCE_PRIMARY_DB = "primary-db"
-    const val SOURCE_PRIMARY_AAI_DATA = "primary-aai-data"
+    const val PROCESSOR_DB = "processor-db"
 
     const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
 
@@ -38,4 +34,4 @@ object ResourceDictionaryConstants {
     const val PROPERTY_KEY_DEPENDENCIES = "key-dependencies"
 
     const val PATH_RESOURCE_DEFINITION_TYPE = "resources_definition_types"
-}
\ No newline at end of file
+}
index b8185c4..26a3a28 100644 (file)
@@ -46,9 +46,9 @@ public class ResourceDefinitionTest {
     @Test
     public void testDictionaryDefinitionDBSource(){
 
-        String fileName = basePath + "/primary-db-source.json";
+        String fileName = basePath + "/processor-db-source.json";
         ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile(fileName, ResourceDefinition.class);
-        Assert.assertNotNull("Failed to populate dictionaryDefinition for primary-db type", resourceDefinition);
+        Assert.assertNotNull("Failed to populate dictionaryDefinition for processor-db type", resourceDefinition);
     }
 
     @Test
index 8c41731..cb7ff88 100644 (file)
@@ -25,15 +25,14 @@ public class ResourceSourceMappingFactoryTest {
     @Test
     public void testRegisterResourceMapping() {
 
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-processor-db");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-processor-db");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("processor-db", "source-db");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");
-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-aai-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("config-data", "source-rest");
+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("aai-data", "source-rest");
 
-        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");
-        Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");
+        String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("processor-db");
+        Assert.notNull(nodeTypeName, "Failed to get processor-db mapping");
 
         ResourceSourceMapping resourceSourceMapping = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping();
         Assert.notNull(resourceSourceMapping, "Failed to get resource source mapping");
index 93c4244..ce479d6 100644 (file)
@@ -60,9 +60,9 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected First source Default, but.", ResourceDictionaryConstants.SOURCE_DEFAULT, resourceAssignment.getDictionarySource());
 
         // To Check Assigned Source
-        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB);
+        resourceAssignment.setDictionarySource(ResourceDictionaryConstants.PROCESSOR_DB);
         ResourceDictionaryUtils.populateSourceMapping(resourceAssignment, resourceDefinition);
-        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, resourceAssignment.getDictionarySource());
+        Assert.assertEquals("Expected Assigned source DB, but.", ResourceDictionaryConstants.PROCESSOR_DB, resourceAssignment.getDictionarySource());
 
     }
 
@@ -79,7 +79,7 @@ public class ResourceDictionaryUtilsTest {
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, inputFirstSource);
 
         // TO check the multiple Source
-        sources.put(ResourceDictionaryConstants.SOURCE_PROCESSOR_DB, new NodeTemplate());
+        sources.put(ResourceDictionaryConstants.PROCESSOR_DB, new NodeTemplate());
         String multipleFirstSource = ResourceDictionaryUtils.findFirstSource(sources);
         Assert.assertEquals("Expected source Input, but.", ResourceDictionaryConstants.SOURCE_INPUT, multipleFirstSource);
 
index 5739417..fa82f83 100644 (file)
@@ -22,11 +22,10 @@ object ResourceDictionaryTestUtils {
 
     @JvmStatic
     fun setUpResourceSourceMapping() {
-        ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-processor-db")
-        ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-processor-db")
+        ResourceSourceMappingFactory.registerSourceMapping("processor-db", "source-db")
         ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")
         ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")
-        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")
-        ResourceSourceMappingFactory.registerSourceMapping("primary-aai-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("config-data", "source-rest")
+        ResourceSourceMappingFactory.registerSourceMapping("aai-data", "source-rest")
     }
-}
\ No newline at end of file
+}
index 3bfa416..fb2637e 100644 (file)
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac",
       "managed-ip1"
index 473920d..9bef60d 100644 (file)
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac"
     ]
index f8fe623..8a212ab 100644 (file)
@@ -29,7 +29,7 @@
       "required": true
     },
     "dictionary-name": "bundle-id",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -42,7 +42,7 @@
       "required": true
     },
     "dictionary-name": "bundle-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id"
     ]
@@ -54,7 +54,7 @@
       "type": "string"
     },
     "dictionary-name": "bundle-mac",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "vnf-id",
       "bundle-id"
@@ -67,7 +67,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
@@ -90,7 +90,7 @@
       "type": "string"
     },
     "dictionary-name": "managed-ip1",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "loopback-ip"
     ]
       "type": "string"
     },
     "dictionary-name": "loopback-ip",
-    "dictionary-source": "primary-db",
+    "dictionary-source": "processor-db",
     "dependencies": [
       "bundle-mac"
     ]
index 5b92369..4537dbb 100644 (file)
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.ExceptionHandler
 @RestControllerAdvice("org.onap.ccsdk.cds.controllerblueprints")
 open class ControllerBlueprintExceptionHandler {
 
-    companion object ControllerBlueprintExeptionHandler {
+    companion object ControllerBlueprintExceptionHandler {
         val LOG = LoggerFactory.getLogger(ControllerBlueprintExceptionHandler::class.java)
     }
 
@@ -55,4 +55,3 @@ open class ControllerBlueprintExceptionHandler {
         return ResponseEntity(errorMessage, HttpStatus.resolve(errorCode!!.httpCode))
     }
 }
-
index b35a86b..3f52d91 100644 (file)
@@ -46,7 +46,7 @@ class ResourceDictionaryReactRepositoryTest {
     @Test
     @Commit
     fun test01Save() {
-        val resourceDefinition = JacksonUtils.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json", ResourceDefinition::class.java)
+        val resourceDefinition = JacksonUtils.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json", ResourceDefinition::class.java)
         Assert.assertNotNull("Failed to get resourceDefinition from content", resourceDefinition)
         resourceDefinition!!.name = sourceName
 
@@ -91,4 +91,4 @@ class ResourceDictionaryReactRepositoryTest {
         resourceDictionary.definition = resourceDefinition
         return resourceDictionary
     }
-}
\ No newline at end of file
+}
index 2b16fc0..5ddc8a6 100755 (executable)
@@ -20,7 +20,7 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate.SQL=warn
 logging.level.org.hibernate.type.descriptor.sql=debug
 # Load Resource Source Mappings
-resourceSourceMappings=processor-db=source-processor-db,primary-db=source-processor-db,input=source-input,default=source-default,primary-config-data=source-rest,primary-aai-data=source-rest,capability=source-capability
+resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,config-data=source-rest,aai-data=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
 controllerblueprints.blueprintArchivePath=./target/blueprints/archive
@@ -38,4 +38,4 @@ controllerblueprints.loadResourceDictionaryPaths=./../../../../components/model-
 controllerblueprints.loadCbaExtension=zip
 
 # CBA examples for tests cases
-controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
\ No newline at end of file
+controllerblueprints.loadBlueprintsExamplesPath=./../../../../components/model-catalog/blueprint-model/test-blueprint
index 3ed188b..31f729d 100644 (file)
@@ -7,7 +7,7 @@
       "required": true\r
     },\r
     "dictionary-name": "sample-db-source",\r
-    "dictionary-source": "primary-db",\r
+    "dictionary-source": "processor-db",\r
     "dependencies": [\r
       "input-source"\r
     ]\r
@@ -56,7 +56,7 @@
       "required": true\r
     },\r
     "dictionary-name": "sample-mdsal-source",\r
-    "dictionary-source": "primary-config-data",\r
+    "dictionary-source": "config-data",\r
     "dependencies": []\r
   }\r
 ]\r
index 2e48b6d..c935123 100644 (file)
                   },\r
                   "input-param": false,\r
                   "dictionary-name": "sample-db-source",\r
-                  "dictionary-source": "primary-db",\r
+                  "dictionary-source": "processor-db",\r
                   "dependencies": [\r
                     "hostname"\r
                   ],\r
                   },\r
                   "input-param": false,\r
                   "dictionary-name": "sample-mdsal-source",\r
-                  "dictionary-source": "primary-config-data",\r
+                  "dictionary-source": "config-data",\r
                   "dependencies": [\r
                     "service-instance-id"\r
                   ],\r
                   },\r
                   "input-param": false,\r
                   "dictionary-name": "sample-licenses",\r
-                  "dictionary-source": "primary-config-data",\r
+                  "dictionary-source": "config-data",\r
                   "dependencies": [\r
                     "service-instance-id"\r
                   ],\r
   },\r
   "data_types": {\r
   }\r
-}
\ No newline at end of file
+}\r
index 6937c71..b0a6e09 100644 (file)
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-db-source",
-                "dictionary-source" : "primary-db",
+                "dictionary-source" : "processor-db",
                 "dependencies" : [ "hostname" ],
                 "version" : 0
               }, {
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-mdsal-source",
-                "dictionary-source" : "primary-config-data",
+                "dictionary-source" : "config-data",
                 "dependencies" : [ "service-instance-id" ],
                 "version" : 0
               }, {
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-licenses",
-                "dictionary-source" : "primary-config-data",
+                "dictionary-source" : "config-data",
                 "dependencies" : [ "service-instance-id" ],
                 "version" : 0
               }, {
       }
     }
   }
-}
\ No newline at end of file
+}