cloud config migration from openstack to catdb

remove the wait and sleep code in migration
move cloud config migration from openstack to catdb

Change-Id: Id887a37ce12665e5d8a604308ea251744529491c
Issue-ID: SO-1461
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

1 files changed, 35 insertions, 6 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml
index f84e194962..954e41aa68 100644
--- a/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml
+++ b/adapters/mso-catalog-db-adapter/src/test/resources/application-test.yaml
@@ -20,6 +20,11 @@ spring:
     driver-class-name: org.mariadb.jdbc.Driver
     initialization-mode: always
     data: classpath*:data.sql
+  flyway:
+    baseline-on-migrate: false
+    url: jdbc:mariadb://localhost:3307/catalogdb
+    user: root
+    password: password
   jpa:   
     generate-ddl: false
     show-sql: false
@@ -69,9 +74,33 @@ management:
         enabled: true # Whether exporting of metrics to Prometheus is enabled.
         step: 1m # Step size (i.e. reporting frequency) to use.  
 
-
-flyway:
-  baseline-on-migrate: false
-  jdbc-url: jdbc:mariadb://localhost:3307/catalogdb
-  user: root
-  password: password
+cloud_config:
+  identity_services:
+    MTKEYSTONE:
+      identity_url: "http://localhost:5000/v2.0"
+      mso_id: "john"
+      mso_pass: "313DECE408AF7759D442D7B06DD9A6AA"
+      admin_tenant: "admin"
+      member_role: "_member_"
+      tenant_metadata: false
+      identity_server_type: "KEYSTONE"
+      identity_authentication_type: "USERNAME_PASSWORD"
+  cloud_sites:
+    mtn13:
+      region_id: "mtn13"
+      clli: "MDT13"
+      aic_version: "3.0"
+      identity_service_id: "MTN13"
+      orchestrator: "orchestrator"
+      cloudify_id: "mtn13"
+    regionOne:
+      region_id: "regionOne"
+      clli: "MT2"
+      aic_version: "2.5"
+      identity_service_id: "MTKEYSTONE"
+  cloudify_managers:
+    manager:
+      cloudify_url: "http://localhost:8080"
+      username: "user"
+      password: "password"
+      version: "2.0"