diff options
Diffstat (limited to 'examples/examples-onap-vcpe/src/main/resources/logic')
26 files changed, 146 insertions, 104 deletions
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AAILookupTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AAILookupTask.js index fcb39052d..7d0178261 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AAILookupTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AAILookupTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,17 +29,18 @@ executor.logger.info("Executing A&AI Lookup"); executor.logger.info(vcpeClosedLoopStatus); var aaiInfo = vcpeClosedLoopStatus.get("AAI"); +var returnValue = true; if (aaiInfo.get("vserverName") == null) { executor.message = "the field vserver.vserver-name must exist in the onset control loop event"; executor.logger.warn(executor.message); - var returnValue = executor.isFalse; + returnValue = false; } else if (aaiInfo.get("genericVnfVnfId") == null && aaiInfo.get("genericVnfVnfName") == null) { executor.message = "either the field generic-vnf.vnf-id or generic-vnf.vnf-name must exist" + " in the onset control loop event"; executor.logger.warn(executor.message); - var returnValue = executor.isFalse; + returnValue = false; } else { var restManager = new org.onap.policy.rest.RestManager; @@ -46,7 +48,7 @@ else { // We need to instantiate the type in order to trigger the static JAXB handling // in the AaiCqResponse class - var aaiCqResponseType = Java.type("org.onap.policy.aai.AaiCqResponse"); + var aaiCqResponseType = org.onap.policy.aai.AaiCqResponse; var aaiResponse = aaiManager.getCustomQueryResponse( "http://localhost:54321/OnapVCpeSim/sim", @@ -80,6 +82,6 @@ else { executor.outFields.put("vnfID", executor.inFields.get("vnfID")); executor.logger.info(executor.outFields); - - var returnValue = executor.isTrue; } + +returnValue; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js index dd69dcb1d..9ee928fca 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFRequestTask.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -64,4 +65,4 @@ executor.outFields.put("APPCLCMRequestEvent", appcRequest); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFResponseTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFResponseTask.js index 75ab6a3af..ac22abbff 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFResponseTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/APPCRestartVNFResponseTask.js @@ -1,26 +1,27 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * APPC LCM Response code: 100 ACCEPTED * 200 ERROR UNEXPECTED ERROR means failure * 312 REJECTED DUPLICATE REQUEST - * 400 SUCCESS + * 400 SUCCESS * * Note: Sometimes the corelationId has a -1 at the tail, need to get rid of it when present. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -38,7 +39,7 @@ executor.logger.info("Size of RequestIDVNFIDAlbum = " + executor.getContextAlbum("RequestIDVNFIDAlbum").size()); executor.logger.info("vnfID = " + vnfID); -var returnValue = executor.isTrue; +var returnValue = true; if (vnfID != null) { var vcpeClosedLoopStatus = executor.getContextAlbum( @@ -82,7 +83,9 @@ if (vnfID != null) { } else { executor.message = "VNF ID not found in context album for request ID " + requestIDString; - returnValue = executor.isFalse; + returnValue = false } executor.logger.info(executor.outFields); + +returnValue; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AbatedTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AbatedTask.js index f37b6f1b5..e19b8b1f4 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AbatedTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/AbatedTask.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -21,7 +22,7 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var vcpeClosedLoopStatus = null; +var vcpeClosedLoopStatus = null; if( executor.inFields.get("vnfID") == null) { executor.logger.info("AbatedTask: vnfID is null"); var vnfName = executor.inFields.get("vnfName"); @@ -38,4 +39,4 @@ vcpeClosedLoopStatus.put("message", "situation has been abated"); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/ControlLoopLogTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/ControlLoopLogTask.js index a5a692cbc..3e2771a74 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/ControlLoopLogTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/ControlLoopLogTask.js @@ -63,6 +63,7 @@ clNotification.getAai().put("generic-vnf.orchestration-status", aaiInfo.get(" clNotification.getAai().put("generic-vnf.vnf-type", aaiInfo.get("genericVnfVnfType")); clNotification.getAai().put("generic-vnf.in-maint", aaiInfo.get("genericVnfInMaint")); clNotification.getAai().put("generic-vnf.service-id", aaiInfo.get("genericVnfServiceId")); + if(vnfID != null) { clNotification.getAai().put("generic-vnf.vnf-id", aaiInfo.get("genericVnfVnfId")); } @@ -70,4 +71,4 @@ executor.outFields.put("VirtualControlLoopNotification", clNotification); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/DeniedTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/DeniedTask.js index 353c21ef6..73b989f5e 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/DeniedTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/DeniedTask.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -29,4 +30,4 @@ vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis( executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GetVCPEStateTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GetVCPEStateTask.js index f4f6d908d..9882a434f 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GetVCPEStateTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GetVCPEStateTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +26,9 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var clEventType = Java.type("org.onap.policy.controlloop.VirtualControlLoopEvent"); -var longType = Java.type("java.lang.Long"); -var uuidType = Java.type("java.util.UUID"); +var clEventType = org.onap.policy.controlloop.VirtualControlLoopEvent; +var longType = java.lang.Long; +var uuidType = java.util.UUID; var clEvent = executor.inFields.get("VirtualControlLoopEvent"); @@ -146,4 +147,4 @@ else { executor.logger.info(executor.outFields); } -returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardRequestTask.js index d247f8a65..66c6213e1 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardRequestTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardRequestTask.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -41,4 +42,4 @@ executor.getContextAlbum("ControlLoopExecutionIDAlbum").put(executor.executionId executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardResponseTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardResponseTask.js index 2a9100b7f..55fee56dd 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardResponseTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/GuardResponseTask.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -29,17 +30,18 @@ var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum") executor.logger.info(vcpeClosedLoopStatus); var guardResult = executor.inFields.get("decision"); +var returnValue = true; -if (guardResult === "PERMIT") { +if (guardResult == "PERMIT") { vcpeClosedLoopStatus.put("notification", "OPERATION: GUARD_PERMIT"); -} else if (guardResult === "DENY") { +} else if (guardResult == "DENY") { vcpeClosedLoopStatus.put("notification", "OPERATION: GUARD_DENY"); } else { executor.message = "guard result must be either \"PERMIT\" or \"DENY\""; - returnValue = executor.FALSE; + returnValue = false; } -var uuidType = Java.type("java.util.UUID"); +var uuidType = java.util.UUID; var requestID = uuidType.fromString(vcpeClosedLoopStatus.get("requestID")); executor.outFields.put("requestID", requestID); @@ -47,4 +49,5 @@ executor.outFields.put("vnfID", vnfID); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; + +returnValue; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/NoAAILookupTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/NoAAILookupTask.js index ebc0e6387..7b3d5c478 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/NoAAILookupTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/NoAAILookupTask.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -23,4 +24,4 @@ executor.logger.info(executor.inFields); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/OnsetOrAbatedStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/OnsetOrAbatedStateTSL.js index c8a3bfba8..4f6c32120 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/OnsetOrAbatedStateTSL.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/OnsetOrAbatedStateTSL.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -21,7 +22,7 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var returnValue = executor.isTrue; +var returnValue = true; var status = null; if( executor.inFields.get("vnfID") == null) { @@ -36,16 +37,16 @@ if( executor.inFields.get("vnfID") == null) { status = vcpeClosedLoopStatus.get("closedLoopEventStatus").toString(); } -var returnValue = executor.isTrue; - -if (status === "ONSET") { +if (status == "ONSET") { executor.subject.getTaskKey("GuardRequestTask").copyTo(executor.selectedTask); -} else if (status === "ABATED") { +} else if (status == "ABATED") { executor.subject.getTaskKey("AbatedTask").copyTo(executor.selectedTask); onsetFlag = executor.isFalse; } else { executor.message = "closedLoopEventStatus is \"" + status + "\", it must be either \"ONSET\" or \"ABATED\""; - returnValue = executor.isFalse; + returnValue = false; } executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask); + +returnValue; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/RestartAPPCRequestPolicyPermitOrDenyTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/RestartAPPCRequestPolicyPermitOrDenyTSL.js index a1bac6546..7ab346f53 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/definitive/RestartAPPCRequestPolicyPermitOrDenyTSL.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/definitive/RestartAPPCRequestPolicyPermitOrDenyTSL.js @@ -1,19 +1,20 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -26,7 +27,7 @@ var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum") var guardResult = vcpeClosedLoopStatus.get("notification"); -if (guardResult === "OPERATION: GUARD_PERMIT") { +if (guardResult == "OPERATION: GUARD_PERMIT") { executor.subject.getTaskKey("APPCRestartVNFRequestTask").copyTo(executor.selectedTask); } else { executor.subject.getTaskKey("DeniedTask").copyTo(executor.selectedTask); @@ -34,4 +35,4 @@ if (guardResult === "OPERATION: GUARD_PERMIT") { executor.logger.info("RestartAPPCRequestPolicyPermitOrDenyTSL State Selected Task:" + executor.selectedTask); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js index 88bf72671..6d5df84c3 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckServiceIdTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +29,8 @@ var blackFlag = executor.getContextAlbum("ServiceIdWhiteBlackListAlbum").get(ser executor.logger.info("vnfId=" + vnfId + ", serviceId=" + serviceId + ", blackFlag=" + blackFlag); -if (blackFlag != null && blackFlag === true) { - vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); +if (blackFlag != null && blackFlag == true) { + vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); vcpeClosedLoopStatus.put("notification", "BLACKLIST"); var message = vcpeClosedLoopStatus.get("message"); @@ -43,4 +44,5 @@ if (blackFlag != null && blackFlag === true) { executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; + diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js index d4e3f30dc..7bca8659b 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVNFIdTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,9 +27,9 @@ var blackFlag = executor.getContextAlbum("VnfIdWhiteBlackListAlbum").get(vnfId); executor.logger.info("vnfId=" + vnfId + ", blackFlag=" + blackFlag); -if (blackFlag != null && blackFlag === true) { +if (blackFlag != null && blackFlag == true) { var vcpeClosedLoopStatus = executor.getContextAlbum("ControlLoopStatusAlbum").get(vnfId); - vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); + vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); vcpeClosedLoopStatus.put("notification", "BLACKLIST"); var message = vcpeClosedLoopStatus.get("message"); @@ -42,4 +43,4 @@ if (blackFlag != null && blackFlag === true) { executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js index 785d93f25..843011024 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/CheckVServerIdTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,8 +29,8 @@ var blackFlag = executor.getContextAlbum("VServerIdWhiteBlackListAlbum").get(vSe executor.logger.info("vnfId=" + vnfId + ", vServerId=" + vServerId + ", blackFlag=" + blackFlag); -if (blackFlag != null && blackFlag === true) { - vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); +if (blackFlag != null && blackFlag == true) { + vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); vcpeClosedLoopStatus.put("notification", "BLACKLIST"); var message = vcpeClosedLoopStatus.get("message"); @@ -43,4 +44,5 @@ if (blackFlag != null && blackFlag === true) { executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; + diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js index 2d41e5f90..b16404292 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ConfigureBlackWhiteListTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,21 +30,24 @@ var targetType = executor.inFields.get("targetType"); var target = executor.inFields.get("target"); var black = executor.inFields.get("black"); -var returnValue = executor.isTrue; +var returnValue = true; -if (targetType === "VNF") { +if (targetType == "VNF") { executor.getContextAlbum("VnfIdWhiteBlackListAlbum").put(target, black); executor.logger.info("added VNF ID \"" + target + "\" with black flag \"" + black + "\" to VNF ID list"); } -else if (targetType === "Service") { +else if (targetType == "Service") { executor.getContextAlbum("ServiceIdWhiteBlackListAlbum").put(target, black); executor.logger.info("added Service ID \"" + target + "\" with black flag \"" + black + "\" to Service ID list"); } -else if (targetType === "VServer") { +else if (targetType == "VServer") { executor.getContextAlbum("VServerIdWhiteBlackListAlbum").put(target, black); executor.logger.info("added VServer ID \"" + target + "\" with black flag \"" + black + "\" to VServer ID list"); } else { executor.logger.warn("unknown target type \"" + targetType + "\" specified"); - returnValue = executor.isFalse; + returnValue = false; } + +returnValue; + diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js index ca2166c75..615901c4b 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControlLoopLogTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,4 +73,4 @@ executor.outFields.put("VirtualControlLoopNotification", clNotification); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js index b6d4cae38..457b80193 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerRequestTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +45,7 @@ controllerRequestBodyInput.put("action", "Restart"); controllerRequestBodyInput.put("action_DasH_identifiers", new java.util.HashMap()); controllerRequestBodyInput.get("action_DasH_identifiers").put("vnf-id", executor.inFields.get("vnfID").toString()); -controllerRequestBodyInputCommonHeader.put("timestamp", java.lang.System.currentTimeMillis()); +controllerRequestBodyInputCommonHeader.put("timestamp", java.lang.Long.valueOf(Date.now())); controllerRequestBodyInputCommonHeader.put("api_DasH_ver", "2.00"); controllerRequestBodyInputCommonHeader.put("originator_DasH_id", executor.inFields.get("requestID").toString()); controllerRequestBodyInputCommonHeader.put("request_DasH_id", executor.inFields.get("requestID").toString()); @@ -62,10 +63,11 @@ executor.getContextAlbum("RequestIDVNFIDAlbum").put(executor.inFields.get("reque executor.inFields.get("vnfID")); vcpeClosedLoopStatus.put("notification", "OPERATION"); -vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); +vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); executor.outFields.put("ControllerRequest", controllerRequest); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; + diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js index 5a8703780..8cb3e4e41 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ControllerResponseTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,13 +36,13 @@ executor.logger.info("requestIDString =\"" + requestIDString + "\""); var vnfID = executor.getContextAlbum("RequestIDVNFIDAlbum").get(requestIDString); executor.logger.info("vnfID = " + vnfID); -var returnValue = executor.isTrue; +var returnValue = true if (vnfID != null) { var vcpeClosedLoopStatus = executor.getContextAlbum("ControlLoopStatusAlbum").get(vnfID.toString()); var requestId = java.util.UUID.fromString(vcpeClosedLoopStatus.get("requestID")); - vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); + vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); var returnedCode = controllerResponse.get("body").get("output").get("status").get("code"); var responseStatus = null; @@ -66,11 +67,11 @@ if (vnfID != null) { executor.logger.info("Got from APPC code: " + responseStatus); - if (responseStatus === "SUCCESS") { + if (responseStatus == "SUCCESS") { vcpeClosedLoopStatus.put("notification", "OPERATION_SUCCESS"); vcpeClosedLoopStatus.put("message", "vCPE restarted"); executor.getContextAlbum("RequestIDVNFIDAlbum").remove(requestIDString); - } else if (responseStatus === "ACCEPTED" || responseStatus === "REJECT") { + } else if (responseStatus == "ACCEPTED" || responseStatus == "REJECT") { executor.logger.info("Got ACCEPTED 100 or REJECT 312, keep the context, wait for next response. Code is: " + responseStatus); } else { @@ -84,7 +85,9 @@ if (vnfID != null) { executor.outFields.put("vnfID", vnfID); } else { executor.message = "VNF ID not found in context album for request ID " + requestIDString; - returnValue = executor.isFalse; + returnValue = false; } executor.logger.info(executor.outFields); + +returnValue; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js index c24e76523..998f6a20a 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoControllerRequestActionTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,4 +25,4 @@ executor.logger.info(executor.inFields); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js index 003942e22..77155645d 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/DoLogActionTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,4 +26,4 @@ executor.logger.info(executor.inFields); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js index a8bb40c80..a74f39789 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ExecuteActionsPolicyActionStateTSL.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,13 +22,14 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var returnValue = executor.isTrue; var status = null; -if (executor.inFields.get("action") === "ControllerRequestAction") { +if (executor.inFields.get("action") == "ControllerRequestAction") { executor.subject.getTaskKey("DoControllerRequestActionTask").copyTo(executor.selectedTask); } else { executor.subject.getTaskKey("DoLogActionTask").copyTo(executor.selectedTask); } executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask); + +true; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js index 1567608bb..13129f224 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +26,8 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var utf8Type = Java.type("org.apache.avro.util.Utf8"); -var uuidType = Java.type("java.util.UUID"); +var utf8Type = org.apache.avro.util.Utf8; +var uuidType = java.util.UUID; var clEvent = executor.inFields.get("VirtualControlLoopEvent"); @@ -61,7 +62,7 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) != vcpeClosedLoopStatus.put("policyName", "ONAPvCPEPolicyModel"); vcpeClosedLoopStatus.put("policyVersion", "0.0.1"); vcpeClosedLoopStatus.put("notification", "ACTIVE"); - vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); + vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); vcpeClosedLoopStatus.put("message", ""); var aaiInfo = executor.getContextAlbum("ControlLoopStatusAlbum").getSchemaHelper().createNewSubInstance( @@ -130,7 +131,7 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) != vcpeClosedLoopStatus.put("policyName", "ONAPvCPEPolicyModel"); vcpeClosedLoopStatus.put("policyVersion", "0.0.1"); vcpeClosedLoopStatus.put("notification", "ACTIVE"); - vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); + vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); vcpeClosedLoopStatus.put("message", ""); var aaiInfo = executor.getContextAlbum("ControlLoopStatusAlbum").getSchemaHelper().createNewSubInstance( @@ -154,4 +155,5 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) != executor.logger.info(executor.outFields); } -var returnValue = executor.isTrue; +true; + diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js index 0303bc9a4..d5c3999b6 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/InitiateActionsTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +27,7 @@ var vcpeClosedLoopStatus = executor.getContextAlbum("ControlLoopStatusAlbum").ge var eventList = executor.subject.getOutFieldSchemaHelper("ActionEventList").createNewInstance(); -var eventType = Java.type("org.onap.policy.apex.service.engine.event.ApexEvent"); +var eventType = org.onap.policy.apex.service.engine.event.ApexEvent; var controllerRequestActionEvent = new eventType("ActionEvent", "0.0.1", "org.onap.policy.apex.onap.vcpe", "APEX", "APEX"); @@ -51,4 +52,5 @@ executor.outFields.put("ActionEventList", eventList); executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; + diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js index 46a65add3..a291f6afb 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/ReceiveEventPolicyExecuteOrLogStateTSL.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +22,7 @@ executor.logger.info(executor.subject.id); executor.logger.info(executor.inFields); -var returnValue = executor.isTrue; +var returnValue = true; if( executor.inFields.get("vnfID") == null) { executor.logger.info("ControlLoopStatusAlbum: vnfID is null"); @@ -36,20 +37,20 @@ if( executor.inFields.get("vnfID") == null) { var status = vcpeClosedLoopStatus.get("closedLoopEventStatus").toString(); var notification = vcpeClosedLoopStatus.get("notification"); -var returnValue = executor.isTrue; - -if (notification != null && notification === "BLACKLIST") { +if (notification != null && notification == "BLACKLIST") { executor.subject.getTaskKey("StopAndLogTask").copyTo(executor.selectedTask); } else { - if (status === "ONSET") { + if (status == "ONSET") { executor.subject.getTaskKey("InitiateActionsTask").copyTo(executor.selectedTask); - } else if (status === "ABATED") { + } else if (status == "ABATED") { executor.subject.getTaskKey("StopAndLogTask").copyTo(executor.selectedTask); } else { executor.message = "closedLoopEventStatus is \"" + status + "\", it must be either \"ONSET\" or \"ABATED\""; - returnValue = executor.isFalse; + returnValue = false; } } executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask); + +returnValue; diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js index af57bf1f7..2b062fd8e 100644 --- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js +++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/StopAndLogTask.js @@ -1,6 +1,7 @@ /* * ============LICENSE_START======================================================= * Copyright (C) 2020 Nordix Foundation. + * Modifications Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +33,10 @@ if (executor.inFields.get("vnfID") == null) { .get(executor.inFields.get("vnfID").toString()); } -vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis()); +vcpeClosedLoopStatus.put("notificationTime", java.lang.Long.valueOf(Date.now())); var message = vcpeClosedLoopStatus.get("message"); -if (message == null || message === "") { +if (message == null || message == "") { vcpeClosedLoopStatus.put("message", "situation has been abated"); } else { @@ -44,4 +45,4 @@ else { executor.logger.info(executor.outFields); -var returnValue = executor.isTrue; +true; |