diff options
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_template.env | 2 | ||||
| -rwxr-xr-x | vnfs/vFW/scripts/update-vfw-op-policy.sh | 16 |
4 files changed, 19 insertions, 3 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 97f575a2..95a768a3 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -121,7 +121,7 @@ parameters: mr_branch: master policy_branch: amsterdam portal_branch: amsterdam - robot_branch: master + robot_branch: amsterdam sdc_branch: release-1.1.0 sdnc_branch: amsterdam vid_branch: amsterdam diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 27f53270..ff9b1c52 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -878,7 +878,7 @@ resources: __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __gerrit_branch__: { get_param: mr_branch } + __gerrit_branch__: { get_param: robot_branch } __cloud_env__: { get_param: cloud_env } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env index 288955cf..c23595e8 100644 --- a/heat/ONAP/onap_openstack_template.env +++ b/heat/ONAP/onap_openstack_template.env @@ -121,7 +121,7 @@ parameters: mr_branch: master policy_branch: amsterdam portal_branch: amsterdam - robot_branch: master + robot_branch: amsterdam sdc_branch: release-1.1.0 sdnc_branch: amsterdam vid_branch: amsterdam diff --git a/vnfs/vFW/scripts/update-vfw-op-policy.sh b/vnfs/vFW/scripts/update-vfw-op-policy.sh index 839250dc..04a36176 100755 --- a/vnfs/vFW/scripts/update-vfw-op-policy.sh +++ b/vnfs/vFW/scripts/update-vfw-op-policy.sh @@ -9,6 +9,22 @@ POLICY_HOST=$1 RESOURCE_ID=$2 PATH_TO_PRIVATE_KEY=$3 +echo +echo +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 '{ + "pdpGroup": "default", + "policyComponent" : "PDP", + "policyName": "com.BRMSParamvFirewall", + "policyType": "BRMS_Param" +}' http://${POLICY_HOST}:8081/pdp/api/deletePolicy + +sleep 20 + +echo echo echo "Updating vFW Operational Policy .." echo |