diff options
3 files changed, 18 insertions, 1 deletions
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 667799a9..2f469a78 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 @@ -125,6 +125,7 @@ static const char * const evel_json_token_strings[JSON_TOKEN_TYPES] = { /*****************************************************************************/ static const char * evel_domain_strings[EVEL_MAX_DOMAINS] = { "internal", + "batch", "heartbeat", "fault", "measurementsForVfScaling", diff --git a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json index 7dfef260..ccfcd252 100644 --- a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json +++ b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json @@ -1340,7 +1340,7 @@ }
}
},
- "required": [ "name", "measurements" ]
+ "required": [ "name", "arrayOfFields" ]
},
"otherFields": {
"description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
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 |