summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--csit/plans/sdnc/setup.sh6
-rw-r--r--csit/tests/sdnc/sdnc_csit.robot56
-rwxr-xr-xinstallation/sdnc/src/main/docker/Dockerfile22
3 files changed, 43 insertions, 41 deletions
diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh
index ec5d9b9e..5b8e4fa8 100644
--- a/csit/plans/sdnc/setup.sh
+++ b/csit/plans/sdnc/setup.sh
@@ -109,10 +109,8 @@ fi
num_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1)
if [ "$num_bundles" -ge 333 ]; then
- num_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | tail -1 | cut -d' ' -f1)
-
- num_failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep Failure | wc -l)
- failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep Failure)
+ num_failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep -w Failure | wc -l)
+ failed_bundles=$(docker exec -i ${SDNC_CONTAINER_NAME} sh -c "echo '' | /opt/opendaylight/current/bin/client bundle:list" | grep -w Failure)
echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.
fi
diff --git a/csit/tests/sdnc/sdnc_csit.robot b/csit/tests/sdnc/sdnc_csit.robot
index 7fdbbbfe..63a1c126 100644
--- a/csit/tests/sdnc/sdnc_csit.robot
+++ b/csit/tests/sdnc/sdnc_csit.robot
@@ -28,21 +28,21 @@ Check Dropping NETCONF/TLS Connection
[Documentation] Checking PNF Simulator Mount Delete from SDNC
Send Delete Request And Validate PNF Mount Deleted ${SDNC_MOUNT_PATH} 200
-Load network preload data
- [Tags] SDNC-GRA-PRELOAD-NETWORK
- [Documentation] Loading network preload data
- Send Post File And Validate Response ${GRA_PRELOAD_NETWORK} ${GRA_DATA_DIRECTORY}/preload-network.json 200
-
-Load vf-module preload data
- [Tags] SDNC-GRA-PRELOAD-VF-MODULE
- [Documentation] Loading vf-module preload data
- Send Post File And Validate Response ${GRA_PRELOAD_VFMODULE} ${GRA_DATA_DIRECTORY}/preload-vf-module.json 200
-
-Check GRA service assign
- [Tags] SDNC-GRA-SERVICE-ASSIGN
- [Documentation] Testing GRA service assign
- Send Post File And Validate Response ${GRA_SERVICE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/svc-topology-assign.json 200
-
+#Load network preload data
+# [Tags] SDNC-GRA-PRELOAD-NETWORK
+# [Documentation] Loading network preload data
+# Send Post File And Validate Response ${GRA_PRELOAD_NETWORK} ${GRA_DATA_DIRECTORY}/preload-network.json 200
+
+#Load vf-module preload data
+# [Tags] SDNC-GRA-PRELOAD-VF-MODULE
+# [Documentation] Loading vf-module preload data
+# Send Post File And Validate Response ${GRA_PRELOAD_VFMODULE} ${GRA_DATA_DIRECTORY}/preload-vf-module.json 200
+
+#Check GRA service assign
+# [Tags] SDNC-GRA-SERVICE-ASSIGN
+# [Documentation] Testing GRA service assign
+# Send Post File And Validate Response ${GRA_SERVICE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/svc-topology-assign.json 200
+
#Check GRA network assign
# [Tags] SDNC-GRA-NETWORK-ASSIGN
# [Documentation] Testing GRA network assign
@@ -58,25 +58,25 @@ Check GRA service assign
# [Documentation] Testing GRA vf-module assign
# Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-assign.json 200
-Check GRA vf-module unassign
- [Tags] SDNC-GRA-VF-MODULE-UNASSIGN
- [Documentation] Testing GRA vf-module unassign
- Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-unassign.json 200
+#Check GRA vf-module unassign
+# [Tags] SDNC-GRA-VF-MODULE-UNASSIGN
+# [Documentation] Testing GRA vf-module unassign
+# Send Post File And Validate Response ${GRA_VFMODULE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vf-module-topology-unassign.json 200
+
+#Check GRA vnf unassign
+# [Tags] SDNC-GRA-VNF-UNASSIGN
+# [Documentation] Testing GRA vnf unassign
+# Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-unassign.json 200
-Check GRA vnf unassign
- [Tags] SDNC-GRA-VNF-UNASSIGN
- [Documentation] Testing GRA vnf unassign
- Send Post File And Validate Response ${GRA_VNF_TOPOLOGY} ${GRA_DATA_DIRECTORY}/vnf-topology-unassign.json 200
-
#Check GRA network unassign
# [Tags] SDNC-GRA-NETWORK-UNASSIGN
# [Documentation] Testing GRA network unassign
# Send Post File And Validate Response ${GRA_NETWORK_TOPOLOGY} ${GRA_DATA_DIRECTORY}/network-topology-unassign.json 200
-Check GRA service delete
- [Tags] SDNC-GRA-SERVICE-DELETE
- [Documentation] Testing GRA service delete
- Send Post File And Validate Response ${GRA_SERVICE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/svc-topology-delete.json 200
+#Check GRA service delete
+# [Tags] SDNC-GRA-SERVICE-DELETE
+# [Documentation] Testing GRA service delete
+# Send Post File And Validate Response ${GRA_SERVICE_TOPOLOGY} ${GRA_DATA_DIRECTORY}/svc-topology-delete.json 200
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile
index 05d68fce..7bb3d23a 100755
--- a/installation/sdnc/src/main/docker/Dockerfile
+++ b/installation/sdnc/src/main/docker/Dockerfile
@@ -56,6 +56,10 @@ RUN echo org.ops4j.pax.web.ssl.keypassword=$SDNC_KEYPASS >> $ODL_HOME/etc/custom
# Overwrite svclogic compiler properties
RUN cp /opt/onap/sdnc/data/properties/svclogic-compiler.properties /opt/onap/sdnc/svclogic/config/svclogic.properties
+# Short term fix starts: for javax.servlet-api bundle (Replacing 4.0.1 to 3.1.0 as it's unique for javax.servlet-api)
+RUN find /opt/opendaylight -name "*features*.xml" -exec sed -i -e 's|4.0.1|3.1.0|g' {} \;
+# Short term fix ends
+
# Changing ownership and permission of /opt
RUN chown -R odl:odl /opt && chmod -R 755 /opt
@@ -68,18 +72,18 @@ FROM scratch
LABEL maintainer="SDN-C Team (sdnc@lists.onap.org)"
USER root
-ENV LC_ALL en_US.UTF-8
-ENV JAVA_HOME /opt/java/openjdk
-ENV PATH $PATH:/opt/java/openjdk/bin
-
-ENV ODL_HOME /opt/opendaylight/current
-ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties
-ENV SDNC_KEYSTORE ${sdnc.keystore}
-ENV SDNC_KEYPASS ${sdnc.keypass}
+ENV LC_ALL=en_US.UTF-8 \
+ JAVA_HOME=/opt/java/openjdk \
+ PATH=$PATH:/opt/java/openjdk/bin \
+ ODL_HOME=/opt/opendaylight/current \
+ SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties \
+ SDNC_KEYSTORE=${sdnc.keystore} \
+ SDNC_KEYPASS=${sdnc.keypass}
# Copy Everything from stage0
COPY --from=stage0 / /
USER odl
-ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh
EXPOSE 8181
+WORKDIR ${ODL_HOME}
+ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh