Updating image version and fixing tests

Plus adding basic test for macroflow

Change-Id: Ic21b833b5f466065bb2982783f564f515cab1444
Issue-ID: SO-3579
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>

6 files changed, 33 insertions, 1 deletions

diff --git a/plans/so/integration-etsi-testing/config/distribution-test-zip/zipped_sdc_csar.tar.gz b/plans/so/integration-etsi-testing/config/distribution-test-zip/zipped_sdc_csar.tar.gz
index d0e346f3..209dfca4 100644..100755
--- a/plans/so/integration-etsi-testing/config/distribution-test-zip/zipped_sdc_csar.tar.gz
+++ b/plans/so/integration-etsi-testing/config/distribution-test-zip/zipped_sdc_csar.tar.gz
diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env
index 647f53a6..2e732294 100644
--- a/plans/so/integration-etsi-testing/config/env
+++ b/plans/so/integration-etsi-testing/config/env
@@ -1,6 +1,7 @@
 NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
 DOCKER_ENVIRONMENT=remote
-TAG=1.6.0
+TAG=1.7.11
 TIME_OUT_DEFAULT_VALUE_SEC=1200
 PROJECT_NAME=etsiintegrationtesting
 DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
+ETSI_CATALOG_IMAGE_VERSION=1.0.9
diff --git a/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
index bdf5c4de..327e7987 100644
--- a/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
@@ -131,3 +131,5 @@ org:
       adapters:
         network:
           encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
+aai:
+  auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
diff --git a/plans/so/integration-etsi-testing/config/override-files/sdc-controller/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/sdc-controller/onapheat/override.yaml
index ed8bd43f..e450bfd2 100644
--- a/plans/so/integration-etsi-testing/config/override-files/sdc-controller/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/sdc-controller/onapheat/override.yaml
@@ -79,3 +79,10 @@ mso:
         componentNames:
   scheduling:
     enabled: false
+sdc:
+  username: mso
+  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+  key: 566B754875657232314F5548556D3665
+  endpoint: http://sdc-simulator:9991/
+etsi-catalog-manager:
+  endpoint: http://modeling-etsicatalog:8806/api/catalog/v1
diff --git a/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
index 05cb1e56..b57d0e85 100644
--- a/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
@@ -54,3 +54,23 @@ vnfds:
        resourceTemplateId: vnfd2_vnfc4
        vduId: vnfd2_vduForVnfc4
        type: COMPUTE
+  -  vnfdid: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+     vnfclist:
+     -  vnfcid: VNFC5
+        resourceTemplateId: vnfd3_vnfc4
+        vduId: vnfd3_vduForVnfc4
+        type: COMPUTE
+     -  vnfcid: VNFC6
+        resourceTemplateId: vnfd3_vnfc5
+        vduId: vnfd3_vduForVnfc5
+        type: COMPUTE
+  -  vnfdid: 0c960b3a-d88f-11ea-87d0-0242ac130003
+     vnfclist:
+     -  vnfcid: VNFC7
+        resourceTemplateId: vnfd4_vnfc5
+        vduId: vnfd4_vduForVnfc5
+        type: COMPUTE
+     -  vnfcid: VNFC8
+        resourceTemplateId: vnfd4_vnfc6
+        vduId: vnfd4_vduForVnfc6
+        type: COMPUTE
diff --git a/plans/so/integration-etsi-testing/config/wait-for-container.sh b/plans/so/integration-etsi-testing/config/wait-for-container.sh
index 35ee2641..11e32bce 100755
--- a/plans/so/integration-etsi-testing/config/wait-for-container.sh
+++ b/plans/so/integration-etsi-testing/config/wait-for-container.sh
@@ -121,6 +121,7 @@ process_arguments()
  result=$(docker inspect --format '{{.State.Running}}' $CONTAINER_NAME)
 
  if [ $result != "true" ] ; then
+  docker logs $CONTAINER_NAME
   echo "$SCRIPT_NAME $(current_timestamp) ERROR: $CONTAINER_NAME container is not running"
   exit 1
  fi
@@ -142,6 +143,7 @@ process_arguments()
  $WAIT_FOR_SCRIPT -t "$TIME_OUT" -h "$HOST_IP" -p "$PORT"
 
  if [ $? -ne 0 ]; then
+   docker logs $CONTAINER_NAME
    echo "$SCRIPT_NAME $(current_timestamp) ERROR: wait-for.sh failed ..."
    exit 1
  fi