Merge "Resource Resolution Service: Source Rest"

13 files changed, 25 insertions, 25 deletions

diff --git a/components/resource-dict/load/resource_dictionary/mdsal-source.json b/components/resource-dict/load/resource_dictionary/mdsal-source.json
index b38986a4..fa72e5dc 100644
--- a/components/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/components/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -7,7 +7,7 @@
   },

   "updated-by": "brindasanth@onap.com",

   "sources": {

-    "mdsal": {

+    "primary-config-data": {

       "type": "source-rest",

       "properties": {

         "type": "JSON",

diff --git a/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
index 7c8d4f4e..59f51516 100644
--- a/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
+++ b/components/resource-dict/load/resource_dictionary/vfw_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_0"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json b/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
index 0553b8c3..6dda72f7 100644
--- a/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
+++ b/components/resource-dict/load/resource_dictionary/vfw_private_ip_1.json
@@ -13,7 +13,7 @@
         "key" : "vfw_private_ip_1"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/vnf-name.json b/components/resource-dict/load/resource_dictionary/vnf-name.json
index 47371d18..708030ee 100644
--- a/components/resource-dict/load/resource_dictionary/vnf-name.json
+++ b/components/resource-dict/load/resource_dictionary/vnf-name.json
@@ -7,7 +7,7 @@
     "type" : "string"

   },

   "sources" : {

-    "mdsal" : {

+    "primary-config-data" : {

       "type" : "source-rest",

       "properties" : {

         "type" : "JSON",

diff --git a/components/resource-dict/load/resource_dictionary/vnf_name.json b/components/resource-dict/load/resource_dictionary/vnf_name.json
index 4617a264..3164367c 100644
--- a/components/resource-dict/load/resource_dictionary/vnf_name.json
+++ b/components/resource-dict/load/resource_dictionary/vnf_name.json
@@ -7,7 +7,7 @@
     "type" : "string"

   },

   "sources" : {

-    "mdsal" : {

+    "primary-config-data" : {

       "type" : "source-rest",

       "properties" : {

         "type" : "JSON",

diff --git a/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
index 912cfb9a..9bef3c79 100644
--- a/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
+++ b/components/resource-dict/load/resource_dictionary/vpg_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vpg_private_ip_0"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json b/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
index bf987382..52a4542c 100644
--- a/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
+++ b/components/resource-dict/load/resource_dictionary/vsn_private_ip_0.json
@@ -13,7 +13,7 @@
         "key" : "vsn_private_ip_0"
       }
     },
-    "mdsal" : {
+    "primary-config-data" : {
       "type" : "source-rest",
       "properties" : {
         "type" : "JSON",
diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
index 0004b02f..aa06c9da 100644
--- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
+++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDictionaryConstants.kt
@@ -24,7 +24,7 @@ package org.onap.ccsdk.apps.controllerblueprints.resource.dict
 object ResourceDictionaryConstants {
     const val SOURCE_INPUT = "input"
     const val SOURCE_DEFAULT = "default"
-    const val SOURCE_MDSAL = "mdsal"
+    const val SOURCE_PRIMARY_CONFIG_DATA = "primary-config-data"
     const val SOURCE_PRIMARY_DB = "primary-db"
 
     const val MODEL_DIR_RESOURCE_DEFINITION: String = "resource_dictionary"
diff --git a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
index 3f5aef43..f11638e3 100644
--- a/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
+++ b/components/resource-dict/src/test/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/factory/ResourceSourceMappingFactoryTest.java
@@ -28,7 +28,7 @@ public class ResourceSourceMappingFactoryTest {
         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-db", "source-primary-db");

         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("input", "source-input");

         ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("default", "source-default");

-        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("mdsal", "source-rest");

+        ResourceSourceMappingFactory.INSTANCE.registerSourceMapping("primary-config-data", "source-rest");

 

         String nodeTypeName = ResourceSourceMappingFactory.INSTANCE.getRegisterSourceMapping("primary-db");

         Assert.notNull(nodeTypeName, "Failed to get primary-db mapping");

diff --git a/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt b/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
index 50e5c329..74ef6d6d 100644
--- a/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
+++ b/components/resource-dict/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/utils/ResourceDictionaryTestUtils.kt
@@ -25,6 +25,6 @@ object ResourceDictionaryTestUtils {
         ResourceSourceMappingFactory.registerSourceMapping("primary-db", "source-primary-db")

         ResourceSourceMappingFactory.registerSourceMapping("input", "source-input")

         ResourceSourceMappingFactory.registerSourceMapping("default", "source-default")

-        ResourceSourceMappingFactory.registerSourceMapping("mdsal", "source-rest")

+        ResourceSourceMappingFactory.registerSourceMapping("primary-config-data", "source-rest")

     }

 }
\ No newline at end of file
diff --git a/components/resource-dict/src/test/resources/validation/cyclic.json b/components/resource-dict/src/test/resources/validation/cyclic.json
index 7e6472f5..98cd1444 100644
--- a/components/resource-dict/src/test/resources/validation/cyclic.json
+++ b/components/resource-dict/src/test/resources/validation/cyclic.json
@@ -29,7 +29,7 @@
       "required": true

     },

     "dictionary-name": "bundle-id",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -42,7 +42,7 @@
       "required": true

     },

     "dictionary-name": "bundle-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -54,7 +54,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id",

       "bundle-id"

@@ -67,7 +67,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

@@ -90,7 +90,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip1",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

diff --git a/components/resource-dict/src/test/resources/validation/duplicate.json b/components/resource-dict/src/test/resources/validation/duplicate.json
index 28ab71fc..7581ff64 100644
--- a/components/resource-dict/src/test/resources/validation/duplicate.json
+++ b/components/resource-dict/src/test/resources/validation/duplicate.json
@@ -29,7 +29,7 @@
       "required": true

     },

     "dictionary-name": "bundle-id",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -42,7 +42,7 @@
       "required": true

     },

     "dictionary-name": "bundle-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -54,7 +54,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id",

       "bundle-id"

@@ -67,7 +67,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

@@ -90,7 +90,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip1",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

diff --git a/components/resource-dict/src/test/resources/validation/success.json b/components/resource-dict/src/test/resources/validation/success.json
index 5d0e8980..486251d6 100644
--- a/components/resource-dict/src/test/resources/validation/success.json
+++ b/components/resource-dict/src/test/resources/validation/success.json
@@ -29,7 +29,7 @@
       "required": true

     },

     "dictionary-name": "bundle-id",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -42,7 +42,7 @@
       "required": true

     },

     "dictionary-name": "bundle-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id"

     ]

@@ -54,7 +54,7 @@
       "type": "string"

     },

     "dictionary-name": "bundle-mac",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "vnf-id",

       "bundle-id"

@@ -67,7 +67,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]

@@ -90,7 +90,7 @@
       "type": "string"

     },

     "dictionary-name": "managed-ip1",

-    "dictionary-source": "mdsal",

+    "dictionary-source": "primary-config-data",

     "dependencies": [

       "loopback-ip"

     ]