Merge "Resource Resolution Service : 2"

6 files changed, 41 insertions, 41 deletions

diff --git a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
index dd2190843..eae24703b 100644
--- a/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
+++ b/ms/controllerblueprints/distribution/src/main/dc/docker-compose.yaml
@@ -1,37 +1,37 @@
-version: '3.3'

-

-services:

-   db:

-     image: mariadb:latest

-     container_name: cb-mariadb

-     ports:

-       - "3306:3306"

-     volumes:

-       - ~/vm_mysql:/var/lib/mysql

-     restart: always

-     environment:

-       MYSQL_ROOT_PASSWORD: sdnctl

-       MYSQL_DATABASE: sdnctl

-       MYSQL_USER: sdnctl

-       MYSQL_PASSWORD: sdnctl

-   controller-blueprints:

-     depends_on:

-       - db

-     image: onap/ccsdk-controllerblueprints:latest

-     container_name: cb-rest

-     ports:

-       - "8080:8080"

-     restart: always

-     volumes:

-       - ~/share/vm_ms/controllerblueprints/config:/opt/app/onap/config

-       - ~/share/vm_ms/controllerblueprints/logs:/logs

-     environment:

-       APPLICATIONNAME : ControllerBluePrints

-       BUNDLEVERSION: 1.0.0

-       APP_CONFIG_HOME: /opt/app/onap/config

-       DB_URL: jdbc:mysql://db:3306/sdnctl

-       DB_USER: sdnctl

-       DB_PASSWORD: sdnctl

-       INIT_DATA_LOAD: "true"

-       STICKYSELECTORKEY:

+version: '3.3'
+
+services:
+   db:
+     image: mariadb:latest
+     container_name: cb-mariadb
+     ports:
+       - "3306:3306"
+     volumes:
+       - ~/vm_mysql:/var/lib/mysql
+     restart: always
+     environment:
+       MYSQL_ROOT_PASSWORD: sdnctl
+       MYSQL_DATABASE: sdnctl
+       MYSQL_USER: sdnctl
+       MYSQL_PASSWORD: sdnctl
+   controller-blueprints:
+     depends_on:
+       - db
+     image: onap/ccsdk-controllerblueprints:latest
+     container_name: cb-rest
+     ports:
+       - "8080:8080"
+     restart: always
+     volumes:
+       - ~/share/vm_ms/controllerblueprints/config:/opt/app/onap/config
+       - ~/share/vm_ms/controllerblueprints/logs:/logs
+     environment:
+       APPLICATIONNAME : ControllerBluePrints
+       BUNDLEVERSION: 1.0.0
+       APP_CONFIG_HOME: /opt/app/onap/config
+       DB_URL: jdbc:mysql://db:3306/sdnctl
+       DB_USER: sdnctl
+       DB_PASSWORD: sdnctl
+       INIT_DATA_LOAD: "true"
+       STICKYSELECTORKEY:
        ENVCONTEXT: DEV
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java
index fb11c39f4..330eaa844 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/repository/ResourceDictionaryReactRepositoryTest.java
@@ -55,7 +55,7 @@ public class ResourceDictionaryReactRepositoryTest {
     @Test
     @Commit
     public void test01Save() {
-        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-db-source.json", ResourceDefinition.class);
+        ResourceDefinition resourceDefinition = JacksonUtils.Companion.readValueFromFile("./../../../../components/model-catalog/resource-dictionary/starter-dictionary/sample-primary-db-source.json", ResourceDefinition.class);
         Assert.assertNotNull("Failed to get resourceDefinition from content", resourceDefinition);
         resourceDefinition.setName(sourceName);
 
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/application.properties b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
index 29bb2b90b..24cb23a17 100755
--- a/ms/controllerblueprints/modules/service/src/test/resources/application.properties
+++ b/ms/controllerblueprints/modules/service/src/test/resources/application.properties
@@ -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=db=source-db,input=source-input,default=source-default,mdsal=source-rest,capability=source-capability
+resourceSourceMappings=primary-db=source-primary-db,input=source-input,default=source-default,mdsal=source-rest,capability=source-capability
 # Controller Blueprints Core Configuration
 controllerblueprints.blueprintDeployPath=./target/blueprints/deploy
 controllerblueprints.blueprintArchivePath=./target/blueprints/archive
diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
index 3715becad..1c81b74d9 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-resource-assignment.json
@@ -7,7 +7,7 @@
       "required": true

     },

     "dictionary-name": "sample-db-source",

-    "dictionary-source": "db",

+    "dictionary-source": "primary-db",

     "dependencies": [

       "input-source"

     ]

diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
index b066dad63..42978f84b 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json
@@ -225,7 +225,7 @@
                   },

                   "input-param": false,

                   "dictionary-name": "sample-db-source",

-                  "dictionary-source": "db",

+                  "dictionary-source": "primary-db",

                   "dependencies": [

                     "hostname"

                   ],

diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
index b13932b7f..66f18f894 100644
--- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
+++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json
@@ -227,7 +227,7 @@
                 },
                 "input-param" : false,
                 "dictionary-name" : "sample-db-source",
-                "dictionary-source" : "db",
+                "dictionary-source" : "primary-db",
                 "dependencies" : [ "hostname" ],
                 "version" : 0
               }, {