Merge "ONAP normative fixes"

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
index 78b257d..3b4ed54 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
@@ -51,9 +51,9 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion):
                                  "subInterface",
                                  "contrailV2VLANSubInterface",
                                  "multiFlavorVFC",
-                                 "vnfConfiguration",
-                                 "underlayVpn",
-                                 "overlayTunnel"
+                                 "vnfConfiguration"#,
+                                 #"underlayVpn",
+                                 #"overlayTunnel"
                                  ]
                
        responseCodes = [200, 201]

diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index d645f94..02eff23 100755 (executable)
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -147,7 +147,7 @@ docker run --detach --name sdc-FE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}"
 # running healthCheck scripts
 echo "Running health checks, please wait..."
 echo ""
-c=25 # seconds to wait
+c=30 # seconds to wait
 REWRITE="\e[45D\e[1A\e[K"
 while [ $c -gt 0 ]; do
     c=$((c-1))