diff options
| author |   Marco Platania <platania@research.att.com> | 2018-09-12 13:21:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-12 13:21:02 +0000 |
| commit | f1069d8f9de22aded36ee82ac3edb92271b36e0b (patch) | |
| tree | e46a31b731529f54443ab929b0a58c0daf0de36a | |
| parent | e1d28f65310a362b3458c1dccee2524edd3efeb5 (diff) | |
| parent | 21722908719d0e0051d63bfb28af7b69b2008614 (diff) | |
Merge "use https for robot framework and vfw script"
| -rw-r--r-- | boot/robot/integration_robot_properties.py | 2 | ||||
| -rwxr-xr-x | vnfs/vFW/scripts/update-vfw-op-policy.sh | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/boot/robot/integration_robot_properties.py b/boot/robot/integration_robot_properties.py index 105b10ce..a548ab52 100644 --- a/boot/robot/integration_robot_properties.py +++ b/boot/robot/integration_robot_properties.py @@ -81,7 +81,7 @@ GLOBAL_PACKET_GENERATOR_USERNAME = "admin" GLOBAL_PACKET_GENERATOR_PASSWORD = "admin" GLOBAL_PGN_PORT = "2831" # policy info - everything is from the private oam network (also called onap private network) -GLOBAL_POLICY_SERVER_PROTOCOL = "http" +GLOBAL_POLICY_SERVER_PROTOCOL = "https" GLOBAL_POLICY_SERVER_PORT = "8081" GLOBAL_POLICY_HEALTHCHECK_PORT = "6969" GLOBAL_POLICY_AUTH = "dGVzdHBkcDphbHBoYTEyMw==" diff --git a/vnfs/vFW/scripts/update-vfw-op-policy.sh b/vnfs/vFW/scripts/update-vfw-op-policy.sh index 04a36176..fb61b575 100755 --- a/vnfs/vFW/scripts/update-vfw-op-policy.sh +++ b/vnfs/vFW/scripts/update-vfw-op-policy.sh @@ -15,12 +15,12 @@ echo "Removing the vFW Policy from PDP.." echo echo -curl -v -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{ +curl -v -k -X DELETE --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{ "pdpGroup": "default", "policyComponent" : "PDP", "policyName": "com.BRMSParamvFirewall", "policyType": "BRMS_Param" -}' http://${POLICY_HOST}:8081/pdp/api/deletePolicy +}' https://${POLICY_HOST}:8081/pdp/api/deletePolicy sleep 20 @@ -29,7 +29,7 @@ echo echo "Updating vFW Operational Policy .." echo -curl -v -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{ +curl -v -k -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{ "policyConfigType": "BRMS_PARAM", "policyName": "com.BRMSParamvFirewall", "policyDescription": "BRMS Param vFirewall policy", @@ -44,7 +44,7 @@ curl -v -X PUT --header 'Content-Type: application/json' --header 'Accept: text/ "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+'${RESOURCE_ID}'%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" } } -}' http://${POLICY_HOST}:8081/pdp/api/updatePolicy +}' https://${POLICY_HOST}:8081/pdp/api/updatePolicy sleep 5 @@ -54,11 +54,11 @@ echo "Pushing the vFW Policy .." echo echo -curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{ +curl -v -k --silent -X PUT --header 'Content-Type: application/json' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -d '{ "pdpGroup": "default", "policyName": "com.BRMSParamvFirewall", "policyType": "BRMS_Param" -}' http://${POLICY_HOST}:8081/pdp/api/pushPolicy +}' https://${POLICY_HOST}:8081/pdp/api/pushPolicy sleep 20 @@ -78,7 +78,7 @@ echo "PDP-D amsterdam maven coordinates .." echo echo -curl -vvv --silent --user @1b3rt:31nst31n -X GET http://${POLICY_HOST}:9696/policy/pdp/engine/controllers/amsterdam/drools | python -m json.tool +curl -vvv -k --silent --user @1b3rt:31nst31n -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 --silent --user @1b3rt:31nst31n -X GET http://${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 @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 |