From: Marco Platania Date: Mon, 1 Oct 2018 18:28:41 +0000 (+0000) Subject: Merge "Heat templates for vFW and Traffic Distribution" X-Git-Tag: 1.3.0~24 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c35abcbdd0986f1f9540463af548b011afaf8f15;hp=602868b48a92ef2fc1814d71f6fc713d836850a8;p=demo.git Merge "Heat templates for vFW and Traffic Distribution" --- diff --git a/boot/robot/integration_robot_properties.py b/boot/robot/integration_robot_properties.py index 86002f3d..9cdbffa7 100644 --- a/boot/robot/integration_robot_properties.py +++ b/boot/robot/integration_robot_properties.py @@ -57,8 +57,8 @@ GLOBAL_DMAAP_DR_NODE_SERVER_PROTOCOL = "http" GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080" # DROOL server port and credentials GLOBAL_DROOLS_SERVER_PORT = "9696" -GLOBAL_DROOLS_USERNAME = "@1b3rt" -GLOBAL_DROOLS_PASSWORD = "31nst31n" +GLOBAL_DROOLS_USERNAME = "demo@people.osaaf.org" +GLOBAL_DROOLS_PASSWORD = "demo123456!" # log server config - NOTE: no log server is run in HEAT; only on OOM GLOBAL_LOG_SERVER_PROTOCOL = "http" GLOBAL_LOG_ELASTICSEARCH_PORT = "9200" @@ -112,8 +112,8 @@ GLOBAL_POLICY_SERVER_PORT = "8081" GLOBAL_POLICY_HEALTHCHECK_PORT = "6969" GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw==" GLOBAL_POLICY_CLIENTAUTH = "cHl0aG9uOnRlc3Q=" -GLOBAL_POLICY_USERNAME = "healthcheck" -GLOBAL_POLICY_PASSWORD = "zb!XztG34" +GLOBAL_POLICY_USERNAME = "demo@people.osaaf.org" +GLOBAL_POLICY_PASSWORD = "demo123456!" # portal info - everything is from the private oam network (also called onap private network) GLOBAL_PORTAL_SERVER_PROTOCOL = "http" GLOBAL_PORTAL_SERVER_PORT = "8989" diff --git a/vnfs/vFW/scripts/update-vfw-op-policy.sh b/vnfs/vFW/scripts/update-vfw-op-policy.sh index fb61b575..9b3ed610 100755 --- a/vnfs/vFW/scripts/update-vfw-op-policy.sh +++ b/vnfs/vFW/scripts/update-vfw-op-policy.sh @@ -78,7 +78,7 @@ echo "PDP-D amsterdam maven coordinates .." echo echo -curl -vvv -k --silent --user @1b3rt:31nst31n -X GET https://${POLICY_HOST}:9696/policy/pdp/engine/controllers/amsterdam/drools | python -m json.tool +curl -vvv -k --silent --user "demo@people.osaaf.org:demo123456!" -X GET https://${POLICY_HOST}:9696/policy/pdp/engine/controllers/amsterdam/drools | python -m json.tool echo @@ -87,4 +87,4 @@ echo "PDP-D control loop updated .." echo echo -curl -v -k --silent --user @1b3rt:31nst31n -X GET https://${POLICY_HOST}:9696/policy/pdp/engine/controllers/amsterdam/drools/facts/closedloop-amsterdam/org.onap.policy.controlloop.Params | python -m json.tool +curl -v -k --silent --user "demo@people.osaaf.org:demo123456!" -X GET https://${POLICY_HOST}:9696/policy/pdp/engine/controllers/amsterdam/drools/facts/closedloop-amsterdam/org.onap.policy.controlloop.Params | python -m json.tool