Merge "modify aaf csit script"
authorGary Wu <gary.i.wu@huawei.com>
Fri, 30 Mar 2018 19:39:38 +0000 (19:39 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 30 Mar 2018 19:39:38 +0000 (19:39 +0000)
30 files changed:
test/csit/plans/aai/resources/aai-resources/appconfig/janusgraph-cached.properties [moved from test/csit/plans/aai/resources/aai-resources/appconfig/titan-cached.properties with 94% similarity]
test/csit/plans/aai/resources/aai-resources/appconfig/janusgraph-realtime.properties [moved from test/csit/plans/aai/traversal/aai-resources/appconfig/titan-realtime.properties with 94% similarity]
test/csit/plans/aai/resources/aai-traversal/appconfig/janusgraph-cached.properties [moved from test/csit/plans/aai/traversal/aai-resources/appconfig/titan-cached.properties with 94% similarity]
test/csit/plans/aai/resources/aai-traversal/appconfig/janusgraph-realtime.properties [moved from test/csit/plans/aai/resources/aai-resources/appconfig/titan-realtime.properties with 94% similarity]
test/csit/plans/aai/resources/docker-compose.yml
test/csit/plans/aai/resources/setup.sh
test/csit/plans/aai/traversal/aai-resources/appconfig/janusgraph-cached.properties [moved from test/csit/plans/aai/resources/aai-traversal/appconfig/titan-cached.properties with 94% similarity]
test/csit/plans/aai/traversal/aai-resources/appconfig/janusgraph-realtime.properties [moved from test/csit/plans/aai/traversal/aai-traversal/appconfig/titan-realtime.properties with 94% similarity]
test/csit/plans/aai/traversal/aai-traversal/appconfig/janusgraph-cached.properties [moved from test/csit/plans/aai/traversal/aai-traversal/appconfig/titan-cached.properties with 94% similarity]
test/csit/plans/aai/traversal/aai-traversal/appconfig/janusgraph-realtime.properties [moved from test/csit/plans/aai/resources/aai-traversal/appconfig/titan-realtime.properties with 94% similarity]
test/csit/plans/aai/traversal/docker-compose.yml
test/csit/plans/aai/traversal/setup.sh
test/csit/plans/multicloud-vmware/functionality1/testplan.txt
test/csit/plans/multicloud/functionality1/setup.sh
test/csit/plans/multicloud/functionality1/teardown.sh
test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh [new file with mode: 0644]
test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh [new file with mode: 0644]
test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt [new file with mode: 0644]
test/csit/scripts/policy/script1.sh
test/csit/tests/multicloud-vmware/hosts/sanity-host.robot [new file with mode: 0644]
test/csit/tests/multicloud-vmware/images/sanity-image.robot [new file with mode: 0644]
test/csit/tests/multicloud-vmware/networks/sanity-network.robot [new file with mode: 0644]
test/csit/tests/multicloud-vmware/provision/jsoninput/image_file.json [new file with mode: 0644]
test/csit/tests/multicloud-vmware/provision/sanity_test_image.robot
test/csit/tests/multicloud-vmware/samples/sanity-sample.robot [new file with mode: 0644]
test/csit/tests/multicloud/provision/data/capacity.json [new file with mode: 0644]
test/csit/tests/multicloud/provision/sanity_test_multivim.robot
test/csit/tests/vfc/nfvo-multivimproxy/test.robot [new file with mode: 0644]
version-manifest/pom.xml
version.properties

 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
index 3f465c3..6f62e6e 100644 (file)
@@ -6,11 +6,12 @@ services:
     environment:
       - LOCAL_USER_ID=${USER_ID}
       - LOCAL_GROUP_ID=${GROUP_ID}
+      - SKIP_CREATE_DB_SCHEMA_AT_STARTUP=true
     ports:
       - 8447:8447
     volumes:
-      - ${CURRENT_PWD}/aai-resources/appconfig/titan-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/titan-realtime.properties
-      - ${CURRENT_PWD}/aai-resources/appconfig/titan-cached.properties:/opt/app/aai-resources/resources/etc/appprops/titan-cached.properties
+      - ${CURRENT_PWD}/aai-resources/appconfig/janusgraph-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-realtime.properties
+      - ${CURRENT_PWD}/aai-resources/appconfig/janusgraph-cached.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-cached.properties
       - ${CURRENT_PWD}/aai-resources/appconfig/aaiconfig.properties:/opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties
       - ${CURRENT_PWD}/aai-resources/appconfig/application.properties:/opt/app/aai-resources/resources/application.properties
       - ${CURRENT_PWD}/aai-resources/appconfig/logback.xml:/opt/app/aai-resources/resources/logback.xml
@@ -30,8 +31,8 @@ services:
       - LOCAL_GROUP_ID=${GROUP_ID}
       - DISABLE_UPDATE_QUERY=true
     volumes:
-      - ${CURRENT_PWD}/aai-traversal/appconfig/titan-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/titan-realtime.properties
-      - ${CURRENT_PWD}/aai-traversal/appconfig/titan-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/titan-cached.properties
+      - ${CURRENT_PWD}/aai-traversal/appconfig/janusgraph-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-realtime.properties
+      - ${CURRENT_PWD}/aai-traversal/appconfig/janusgraph-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-cached.properties
       - ${CURRENT_PWD}/aai-traversal/appconfig/aaiconfig.properties:/opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
       - ${CURRENT_PWD}/aai-traversal/appconfig/application.properties:/opt/app/aai-traversal/resources/application.properties
       - ${CURRENT_PWD}/aai-traversal/appconfig/logback.xml:/opt/app/aai-traversal/resources/logback.xml
@@ -61,16 +62,18 @@ services:
         max-size: "30m"
         max-file: "5"
   aai.hbase.simpledemo.onap.org:
-    image: ${HBASE_IMAGE}:${HBASE_VERSION}
+    image: cassandra:2.1
     hostname: aai.hbase.simpledemo.onap.org
     ports:
-      - 2181:2181
-      - 8080:8080
-      - 8085:8085
-      - 9090:9090
-      - 16000:16000
-      - 16010:16010
-      - 16201:16201
+      - 7000:7000
+      - 7001:7001
+      - 7199:7199
+      - 9042:9042
+    environment:
+      - CASSANDRA_SEEDS=aai.hbase.simpledemo.onap.org
+      - CASSANDRA_DC=Heat
+      - CASSANDRA_RACK=Rack1
+      - CASSANDRA_AUTO_BOOTSTRAP=true
     logging:
       driver: "json-file"
       options:
index 14b5671..bd5cb52 100644 (file)
@@ -73,10 +73,8 @@ ${DOCKER_COMPOSE_CMD} stop
 ${DOCKER_COMPOSE_CMD} rm -f -v
 
 # Start the hbase where the data will be stored
-HBASE_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai.hbase.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
-wait_for_container ${HBASE_CONTAINER_NAME} ' Started SelectChannelConnector@0.0.0.0:8085';
-wait_for_container ${HBASE_CONTAINER_NAME} ' Started SelectChannelConnector@0.0.0.0:8080';
-wait_for_container ${HBASE_CONTAINER_NAME} ' Started SelectChannelConnector@0.0.0.0:9095';
+CASSANDRA_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai.hbase.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
+wait_for_container $CASSANDRA_CONTAINER_NAME 'Listening for thrift clients';
 
 USER_EXISTS=$(check_if_user_exists aaiadmin);
 
@@ -102,6 +100,8 @@ else
         export USER_ID=$(id -u aaiadmin);
 fi;
 
+$DOCKER_COMPOSE_CMD run --rm aai-resources.api.simpledemo.onap.org createDBSchema.sh
+
 RESOURCES_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started';
 
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
 #
 
 query.fast-property=true
+query.smart-limit=false
+
 # the following parameters are not reloaded automatically and require a manual bounce
-storage.backend=hbase
+storage.backend=cassandra
 storage.hostname=aai.hbase.simpledemo.onap.org
 
+storage.cassandra.keyspace=aaigraph
+
 #schema.default=none
 storage.lock.wait-time=300
 storage.hbase.table=aaigraph-dev1.dev
index 3f465c3..6f62e6e 100644 (file)
@@ -6,11 +6,12 @@ services:
     environment:
       - LOCAL_USER_ID=${USER_ID}
       - LOCAL_GROUP_ID=${GROUP_ID}
+      - SKIP_CREATE_DB_SCHEMA_AT_STARTUP=true
     ports:
       - 8447:8447
     volumes:
-      - ${CURRENT_PWD}/aai-resources/appconfig/titan-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/titan-realtime.properties
-      - ${CURRENT_PWD}/aai-resources/appconfig/titan-cached.properties:/opt/app/aai-resources/resources/etc/appprops/titan-cached.properties
+      - ${CURRENT_PWD}/aai-resources/appconfig/janusgraph-realtime.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-realtime.properties
+      - ${CURRENT_PWD}/aai-resources/appconfig/janusgraph-cached.properties:/opt/app/aai-resources/resources/etc/appprops/janusgraph-cached.properties
       - ${CURRENT_PWD}/aai-resources/appconfig/aaiconfig.properties:/opt/app/aai-resources/resources/etc/appprops/aaiconfig.properties
       - ${CURRENT_PWD}/aai-resources/appconfig/application.properties:/opt/app/aai-resources/resources/application.properties
       - ${CURRENT_PWD}/aai-resources/appconfig/logback.xml:/opt/app/aai-resources/resources/logback.xml
@@ -30,8 +31,8 @@ services:
       - LOCAL_GROUP_ID=${GROUP_ID}
       - DISABLE_UPDATE_QUERY=true
     volumes:
-      - ${CURRENT_PWD}/aai-traversal/appconfig/titan-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/titan-realtime.properties
-      - ${CURRENT_PWD}/aai-traversal/appconfig/titan-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/titan-cached.properties
+      - ${CURRENT_PWD}/aai-traversal/appconfig/janusgraph-realtime.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-realtime.properties
+      - ${CURRENT_PWD}/aai-traversal/appconfig/janusgraph-cached.properties:/opt/app/aai-traversal/resources/etc/appprops/janusgraph-cached.properties
       - ${CURRENT_PWD}/aai-traversal/appconfig/aaiconfig.properties:/opt/app/aai-traversal/resources/etc/appprops/aaiconfig.properties
       - ${CURRENT_PWD}/aai-traversal/appconfig/application.properties:/opt/app/aai-traversal/resources/application.properties
       - ${CURRENT_PWD}/aai-traversal/appconfig/logback.xml:/opt/app/aai-traversal/resources/logback.xml
@@ -61,16 +62,18 @@ services:
         max-size: "30m"
         max-file: "5"
   aai.hbase.simpledemo.onap.org:
-    image: ${HBASE_IMAGE}:${HBASE_VERSION}
+    image: cassandra:2.1
     hostname: aai.hbase.simpledemo.onap.org
     ports:
-      - 2181:2181
-      - 8080:8080
-      - 8085:8085
-      - 9090:9090
-      - 16000:16000
-      - 16010:16010
-      - 16201:16201
+      - 7000:7000
+      - 7001:7001
+      - 7199:7199
+      - 9042:9042
+    environment:
+      - CASSANDRA_SEEDS=aai.hbase.simpledemo.onap.org
+      - CASSANDRA_DC=Heat
+      - CASSANDRA_RACK=Rack1
+      - CASSANDRA_AUTO_BOOTSTRAP=true
     logging:
       driver: "json-file"
       options:
index 118a1bc..70dda84 100644 (file)
@@ -72,10 +72,8 @@ ${DOCKER_COMPOSE_CMD} stop
 ${DOCKER_COMPOSE_CMD} rm -f -v
 
 # Start the hbase where the data will be stored
-HBASE_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai.hbase.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
-wait_for_container ${HBASE_CONTAINER_NAME} ' Started SelectChannelConnector@0.0.0.0:8085';
-wait_for_container ${HBASE_CONTAINER_NAME} ' Started SelectChannelConnector@0.0.0.0:8080';
-wait_for_container ${HBASE_CONTAINER_NAME} ' Started SelectChannelConnector@0.0.0.0:9095';
+CASSANDRA_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai.hbase.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
+wait_for_container $CASSANDRA_CONTAINER_NAME 'Listening for thrift clients';
 
 USER_EXISTS=$(check_if_user_exists aaiadmin);
 
@@ -103,12 +101,16 @@ else
         export GROUP_ID=$(id -g aaiadmin);
 fi;
 
+$DOCKER_COMPOSE_CMD run --rm aai-resources.api.simpledemo.onap.org createDBSchema.sh
+
 RESOURCES_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1);
 wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started';
 
 ${DOCKER_COMPOSE_CMD} up -d aai-traversal.api.simpledemo.onap.org aai.api.simpledemo.onap.org
 TRAVERSAL_CONTAINER_NAME=$(echo $RESOURCES_CONTAINER_NAME | sed 's/aai-resources/aai-traversal/g');
 
+$DOCKER_COMPOSE_CMD run --rm aai-traversal.api.simpledemo.onap.org install/updateQueryData.sh
+
 echo "A&AI Microservices, resources and traversal, are up and running along with HAProxy";
 
 wait_for_container $TRAVERSAL_CONTAINER_NAME 'Traversal Microservice Started';
index 2f5ad1b..0a2ad45 100644 (file)
@@ -7,3 +7,7 @@ multicloud-vmware/provision/sanity_test_neutron.robot
 multicloud-vmware/nova/sanity-flavor.robot
 multicloud-vmware/nova/sanity-host.robot
 multicloud-vmware/nova/sanity-server.robot
+multicloud-vmware/samples/sanity-sample.robot
+multicloud-vmware/hosts/sanity-host.robot
+multicloud-vmware/networks/sanity-network.robot
+multicloud-vmware/images/sanity-image.robot
index 993a39f..479c21d 100755 (executable)
@@ -20,7 +20,9 @@
 source ${SCRIPTS}/common_functions.sh
 
 # start multivim-broker
-docker run -d --name multivim-broker nexus3.onap.org:10001/onap/multicloud/framework
+docker run -d --name multivim-vio nexus3.onap.org:10001/onap/multicloud/vio
+docker run -d --name multivim-broker --link multivim-vio -e MSB_ADDR:multivim-vio -e MSB_ADDR:9004 nexus3.onap.org:10001/onap/multicloud/framework
+
 BROKER_IP=`get-instance-ip.sh multivim-broker`
 for i in {1..50}; do
     curl -sS ${BROKER_IP}:9001 && break
index 1732649..a2ef0e3 100755 (executable)
@@ -16,4 +16,5 @@
 #
 
 # This script is sourced by run-csit.sh after Robot test completion.
+kill-instance.sh multivim-vio
 kill-instance.sh multivim-broker
diff --git a/test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/setup.sh
new file mode 100644 (file)
index 0000000..4d97f33
--- /dev/null
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Place the scripts in run order:
+# Start all process required for executing test case
+
+#login to the onap nexus docker repo
+docker login -u docker -p docker nexus3.onap.org:10001
+
+# Start MSB
+docker run -d -p 8500:8500 --name msb_consul consul:0.9.3
+CONSUL_IP=`get-instance-ip.sh msb_consul`
+echo CONSUL_IP=${CONSUL_IP}
+docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
+DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
+echo DISCOVERY_IP=${DISCOVERY_IP}
+docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+MSB_IP==`get-instance-ip.sh msb_internal_apigateway`
+echo MSB_IP=${MSB_IP}
+
+# Start resmgr
+docker run -d --name vfc-multivimproxy -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/multivimproxy
+RESMGR_IP=`get-instance-ip.sh vfc-multivimproxy`
+for i in {1..20}; do
+    curl -sS ${RESMGR_IP}:8486 && break
+    echo sleep $i
+    sleep $i
+done
+
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v RESMGR_IP:${RESMGR_IP}"
diff --git a/test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh b/test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/teardown.sh
new file mode 100644 (file)
index 0000000..c158d19
--- /dev/null
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Copyright 2018 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script is sourced by run-csit.sh after Robot test completion.
+kill-instance.sh msb_internal_apigateway
+kill-instance.sh msb_discovery
+kill-instance.sh msb_consul
+kill-instance.sh vfc-multivimproxy
diff --git a/test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt b/test/csit/plans/vfc-nfvo-multivimproxy/sanity-check/testplan.txt
new file mode 100644 (file)
index 0000000..f81be8e
--- /dev/null
@@ -0,0 +1,3 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+vfc/nfvo-multivimproxy/test.robot
\ No newline at end of file
index cfa29ec..a09fa5f 100755 (executable)
@@ -105,8 +105,6 @@ fi
 
 docker ps
 
-#sleep 4m
-
 POLICY_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' drools`
 echo ${POLICY_IP}
 
@@ -125,11 +123,26 @@ echo ${NEXUS_IP}
 MARIADB_IP=`docker inspect --format '{{ .NetworkSettings.Networks.docker_default.IPAddress}}' mariadb`
 echo ${MARIADB_IP}
 
+sleep 1m
+
+netstat -tnl
+
+docker logs mariadb
 ${DIR}/wait_for_port.sh ${MARIADB_IP} 3306
+
+docker logs pap
 ${DIR}/wait_for_port.sh ${PAP_IP} 9091
+
+docker logs pdp
 ${DIR}/wait_for_port.sh ${PDP_IP} 8081
+
+docker logs brmsgw
 ${DIR}/wait_for_port.sh ${BRMS_IP} 9989
+
+docker logs nexus
 ${DIR}/wait_for_port.sh ${NEXUS_IP} 8081
+
+docker logs drools
 ${DIR}/wait_for_port.sh ${POLICY_IP} 6969
 
 TIME_OUT=600
diff --git a/test/csit/tests/multicloud-vmware/hosts/sanity-host.robot b/test/csit/tests/multicloud-vmware/hosts/sanity-host.robot
new file mode 100644 (file)
index 0000000..e74a799
--- /dev/null
@@ -0,0 +1,24 @@
+*** settings ***
+Resource    ../../common.robot
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
+
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+
+
+*** Test Cases ***
+
+TestGetHost
+    [Documentation]    Sanity Test - Get Host
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
+    ${resp}=  Get Request    web_session    api/multicloud-vio/v0/vmware_fake/1234/hosts/1
+    ${response_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${response_code}
+    ${response_json}    json.loads    ${resp.content}
+    #Log To Console        ${response_json}
diff --git a/test/csit/tests/multicloud-vmware/images/sanity-image.robot b/test/csit/tests/multicloud-vmware/images/sanity-image.robot
new file mode 100644 (file)
index 0000000..390433d
--- /dev/null
@@ -0,0 +1,24 @@
+*** settings ***
+Resource    ../../common.robot
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
+
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+
+
+*** Test Cases ***
+
+TestGetHost
+    [Documentation]    Sanity Test - Get Image
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
+    ${resp}=  Get Request    web_session    api/multicloud-vio/v0/vmware_fake/1234/images/1
+    ${response_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${response_code}
+    ${response_json}    json.loads    ${resp.content}
+    #Log To Console        ${response_json}
diff --git a/test/csit/tests/multicloud-vmware/networks/sanity-network.robot b/test/csit/tests/multicloud-vmware/networks/sanity-network.robot
new file mode 100644 (file)
index 0000000..5433f18
--- /dev/null
@@ -0,0 +1,24 @@
+*** settings ***
+Resource    ../../common.robot
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
+
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+
+
+*** Test Cases ***
+
+TestGetHost
+    [Documentation]    Sanity Test - Get Network
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
+    ${resp}=  Get Request    web_session    api/multicloud-vio/v0/vmware_fake/1234/networks/1
+    ${response_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${response_code}
+    ${response_json}    json.loads    ${resp.content}
+    #Log To Console        ${response_json}
diff --git a/test/csit/tests/multicloud-vmware/provision/jsoninput/image_file.json b/test/csit/tests/multicloud-vmware/provision/jsoninput/image_file.json
new file mode 100644 (file)
index 0000000..1e3cac6
--- /dev/null
@@ -0,0 +1,7 @@
+{
+        "name": "cirros-0.3.2-x86_64-disk",
+        "container_format": "bare",
+        "disk_format": "qcow2",
+        "visibility": "public",
+        "schema": "/v2/schemas/image"
+}
\ No newline at end of file
index 0a6f2f5..e8e36dc 100644 (file)
@@ -13,10 +13,13 @@ Library     HttpLibrary.HTTP
 ${get_token_url}         /api/multicloud-vio/v0/vmware_fake/identity/v3/auth/tokens
 ${get_image_url}         /api/multicloud-vio/v0/vmware_fake/glance/v2/images
 ${get_image_schema_url}  /api/multicloud-vio/v0/vmware_fake/glance/v2/schemas/image
+${image_service}         /api/multicloud-vio/v0/vmware_fake/glance/v2/image/file
+
 
 
 #json files
 ${auth_info_json}        ${SCRIPTS}/../tests/multicloud-vmware/provision/jsoninput/auth_info.json
+${image_file}            ${SCRIPTS}/../tests/multicloud-vmware/provision/jsoninput/image_file.json
 
 #global vars
 ${TOKEN}
@@ -42,7 +45,7 @@ GetAuthToken
 
 
 
-TestCaseShoeImageSchema
+TestCaseShowImageSchema
     [Documentation]    Sanity test - Show Image Schema
     ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json  X-Auth-Token=${TOKEN}
     Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
@@ -76,3 +79,32 @@ TestCaseShowImage
     List Should Contain Value    ${return_ok_list}   ${responese_code}
     ${response_json}    json.loads    ${resp.content}
     Should Be Equal     ${response_json['status']}    active
+
+
+
+
+TestCaseUploadImage
+    [Documentation]    Sanity test - Upload Image
+    ${json_value}=      json_from_file      ${image_file}
+    ${json_string}=     string_from_json   ${json_value}
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json  X-Auth-Token=${TOKEN}
+    Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
+    ${resp}=  POST Request    web_session    ${image_service}   ${json_string}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${IMAGEID}=    Convert To String  ${response_json['id']}
+    Set Global Variable   ${IMAGEID}
+
+
+
+
+TestCaseDownloadImage
+    [Documentation]    Sanity test - Download Image
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json  X-Auth-Token=${TOKEN}
+    Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
+    ${resp}=  Get Request    web_session    ${image_service}/${IMAGEID}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    Should Be Equal     ${response_json['status']}    active
\ No newline at end of file
diff --git a/test/csit/tests/multicloud-vmware/samples/sanity-sample.robot b/test/csit/tests/multicloud-vmware/samples/sanity-sample.robot
new file mode 100644 (file)
index 0000000..fcb784b
--- /dev/null
@@ -0,0 +1,25 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${querysample_vio_url}    /samples
+
+*** Test Cases ***
+VioSwaggerTest
+    [Documentation]    query swagger info rest test
+    ${headers}    Create Dictionary    Content-Type=application/json  X-TRANSACTIONID=123456  Accept=application/json
+    Create Session    web_session    http://${VIO_IP}:9004    headers=${headers}
+    ${resp}=  Get Request    web_session    ${querysample_vio_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    # verify logging output
+    ${response_json}    json.loads    ${resp.content}
+    ${logs}=   Convert To String      ${response_json['logs']}
+    Log To Console        ${logs}
+    Should Contain        ${logs}  123456
+    Should Contain       ${logs}  multicloud-vio
+    Should Contain       ${logs}  vio.samples.views
\ No newline at end of file
diff --git a/test/csit/tests/multicloud/provision/data/capacity.json b/test/csit/tests/multicloud/provision/data/capacity.json
new file mode 100644 (file)
index 0000000..9b1130d
--- /dev/null
@@ -0,0 +1,6 @@
+{
+    "vCPU": 1,
+    "Memory": 1,
+    "Storage": 1,
+    "VIMs": ["vmware_fake"]
+}
\ No newline at end of file
index 2c1ec3f..4848b74 100644 (file)
@@ -1,4 +1,5 @@
 *** settings ***
+Resource    ../../common.robot
 Library     Collections
 Library     RequestsLibrary
 Library     OperatingSystem
@@ -7,6 +8,7 @@ Library     json
 *** Variables ***
 @{return_ok_list}=   200  201  202
 ${queryswagger_broker_url}    /api/multicloud/v0/swagger.json
+${check_capacity_broker_url}    /api/multicloud/v0/check_vim_capacity
 
 
 *** Test Cases ***
@@ -20,3 +22,12 @@ BrokerSwaggerTest
     ${response_json}    json.loads    ${resp.content}
     ${swagger_version}=    Convert To String      ${response_json['swagger']}
     Should Be Equal    ${swagger_version}    2.0
+
+BrokerCapacityTest
+    [Documentation]    Check VIMs capacity
+    ${data}=         Get Binary File     ${CURDIR}${/}data${/}capacity.json
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${BROKER_IP}:9001    headers=${headers}
+    ${resp}=  Post Request    web_session    ${check_capacity_broker_url}  ${data}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
diff --git a/test/csit/tests/vfc/nfvo-multivimproxy/test.robot b/test/csit/tests/vfc/nfvo-multivimproxy/test.robot
new file mode 100644 (file)
index 0000000..5945da1
--- /dev/null
@@ -0,0 +1,24 @@
+*** settings ***
+Resource    ../../common.robot
+Library     Collections
+Library     RequestsLibrary
+Library     simplejson
+Library     OperatingSystem
+Library     json
+Library     HttpLibrary.HTTP
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /api/multivimproxy/v1/swagger.json
+
+*** Test Cases ***
+SwaggerFuncTest
+    [Documentation]    query swagger info rest test
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${RESMGR_IP}:8486    headers=${headers}
+    ${resp}=  Get Request    web_session    ${queryswagger_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${swagger_version}=    Convert To String      ${response_json['swagger']}
+    Should Be Equal    ${swagger_version}    2.0
\ No newline at end of file
index 20a7210..27a8d03 100644 (file)
@@ -4,11 +4,11 @@
   <parent>
     <groupId>org.onap.oparent</groupId>
     <artifactId>oparent</artifactId>
-    <version>0.1.1</version>
+    <version>1.1.0</version>
   </parent>
   <groupId>org.onap.integration</groupId>
   <artifactId>version-manifest</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>maven-plugin</packaging>
   <name>ONAP Version Manifest and Maven Plugin</name>
   <url>https://www.onap.org</url>
index 49e2720..17a717c 100644 (file)
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=0
-patch_version=0
+patch_version=1
 
 base_version=${major_version}.${minor_version}.${patch_version}