aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--heat/ONAP/onap_openstack.yaml2
-rw-r--r--vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c5
-rw-r--r--vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c2
-rwxr-xr-xvnfs/vFW/scripts/update-vfw-op-policy.sh16
4 files changed, 23 insertions, 2 deletions
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 114d3664..104224b9 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/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c
index 9d3aa610..187a7090 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_event_mgr.c
@@ -474,6 +474,11 @@ EVEL_ERR_CODES event_handler_terminate()
free(evel_event_api_url);
evel_event_api_url = NULL;
}
+ if (evel_batch_api_url != NULL)
+ {
+ free(evel_batch_api_url);
+ evel_batch_api_url = NULL;
+ }
if (evel_throt_api_url != NULL)
{
free(evel_throt_api_url);
diff --git a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c
index 2f469a78..ac664a17 100644
--- a/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c
+++ b/vnfs/VES5.0/evel/evel-library/code/evel_library/evel_throttle.c
@@ -135,7 +135,7 @@ static const char * evel_domain_strings[EVEL_MAX_DOMAINS] = {
"signaling",
"stateChange",
"syslog",
- "other"
+ "other",
"voiceQuality",
"maxDomain"
};
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