diff options
24 files changed, 47 insertions, 42 deletions
diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template index d806855..764e59e 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "${start_time1}", diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.json.template index a8315f6..2dc071a 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "${start_time1}", diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.json.template index e239d7d..ea3740c 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "${start_time1}", diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template index 8cd0703..40a72fb 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "${start_time1}", diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.json.template index 2973c89..e2e0c4a 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "${start_time1}", diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template index e97c46e..bdc541d 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "", diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template index 1c2c3ce..e4b88e9 100644 --- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template +++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template @@ -17,7 +17,7 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "dummy{node}" + "${node1}" ], "changeWindow" : [{ "startTime" : "${end_time1}", diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template index 5c9e0a3..db65877 100644 --- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template +++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template @@ -13,9 +13,9 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "VNFName1${testid}", - "VNFName2${testid}", - "VNFName3${testid}" + "${node1}", + "${node2}", + "${node3}" ] } ] diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template index 19c1d87..19b18f8 100644 --- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template +++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template @@ -13,9 +13,9 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "VNFName1${testid}", - "VNFName2${testid}", - "VNFName3${testid}" + "${node1}", + "${node2}", + "${node3}" ] } ] diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template index ab92d18..e65ae63 100644 --- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template +++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template @@ -13,9 +13,9 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "VNFName1${testid}", - "VNFName2${testid}", - "VNFName3${testid}" + "${node1}", + "${node2}", + "${node3}" ] } ] diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template index 9de749c..44b148a 100644 --- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template +++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template @@ -13,9 +13,9 @@ "vnfDetails" : [{ "groupId" : "", "node" : [ - "VNFName1${testid}", - "VNFName2${testid}", - "VNFName3${testid}" + "${node1}", + "${node2}", + "${node3}" ] } ] diff --git a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template index 86ae4b8..fceef79 100644 --- a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template +++ b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template @@ -12,7 +12,7 @@ "schedulingInfo" : { "vnfDetails" : [{ "node" : [ - "dummy{node}" + "${node1}" ] } ] diff --git a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template index ba555ac..6ec74ad 100644 --- a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template +++ b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template @@ -12,7 +12,7 @@ "schedulingInfo" : { "vnfDetails" : [{ "node" : [ - "dummy{node}" + "${node1}" ] } ] diff --git a/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template b/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template index 542e19e..da460ae 100644 --- a/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template +++ b/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template @@ -9,8 +9,8 @@ } ], "schedulingInfo" : { - "normalDurationInSeconds" : 100, - "additionalDurationInSeconds" : 10, + "normalDurationInSeconds" : 3000, + "additionalDurationInSeconds" : 600, "vnfDetails" : [{ "groupId" : "group", "node" : [ diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template index 4630faa..5e14756 100644 --- a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template +++ b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template @@ -10,10 +10,10 @@ } ], "schedulingInfo" : { - "normalDurationInSeconds" : 100, - "additionalDurationInSeconds" : 10, + "normalDurationInSeconds" : 3600, + "additionalDurationInSeconds" : 0, "concurrencyLimit" : 10, - "policyId" : "dummy-policy-id", + "policyId" : "AllDayEveryDay", "vnfDetails" : [{ "groupId" : "group", "node" : [ diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template index 061b4f6..fa2e4c6 100644 --- a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template +++ b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template @@ -10,10 +10,10 @@ } ], "schedulingInfo" : { - "normalDurationInSeconds" : 100, - "additionalDurationInSeconds" : 10, + "normalDurationInSeconds" : 3000, + "additionalDurationInSeconds" : 600, "concurrencyLimit" : 10, - "policyId" : "dummy-policy-id", + "policyId" : "AllDayEveryDay", "vnfDetails" : [{ "groupId" : "Group1", "node" : [ diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template index a3ada80..158f591 100644 --- a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template +++ b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template @@ -10,10 +10,10 @@ } ], "schedulingInfo" : { - "normalDurationInSeconds" : 100, - "additionalDurationInSeconds" : 10, + "normalDurationInSeconds" : 3600, + "additionalDurationInSeconds" : 0, "concurrencyLimit" : 10, - "policyId" : "dummy-policy-id", + "policyId" : "AllDayEveryDay", "vnfDetails" : [{ "groupId" : "group", "node" : [ diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template index 11a50cb..1db0e45 100644 --- a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template +++ b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template @@ -13,7 +13,7 @@ "normalDurationInSeconds" : 100, "additionalDurationInSeconds" : 10, "concurrencyLimit" : 10, - "policyId" : "dummy-policy-id", + "policyId" : "AllDayEveryDay", "vnfDetails" : [{ "groupId" : "group", "node" : [ diff --git a/cmso-robot/robot/resources/misc.robot b/cmso-robot/robot/resources/misc.robot index 0dd15e9..fe0154d 100644 --- a/cmso-robot/robot/resources/misc.robot +++ b/cmso-robot/robot/resources/misc.robot @@ -22,7 +22,7 @@ Validate Status Validate JSON Error [Documentation] Fails if messageIds do not match. expected_errors should be a list but a string would likely work as well - [Arguments] ${resp_json} ${expected_errors} ${listVars} + [Arguments] ${resp_json} ${expected_errors} ${listVars}=[] ${result}= Get From Dictionary ${resp_json['requestError']} messageId ${variables}= Get From Dictionary ${resp_json['requestError']} variables Should Contain ${expected_errors} ${result} #checks expected_errors list for the actual error received from schedule diff --git a/cmso-robot/robot/resources/test_templates/change_management.robot b/cmso-robot/robot/resources/test_templates/change_management.robot index 6f4167d..cfa958f 100644 --- a/cmso-robot/robot/resources/test_templates/change_management.robot +++ b/cmso-robot/robot/resources/test_templates/change_management.robot @@ -46,14 +46,15 @@ Change Management Rejection Template Change Management Failure Template [Documentation] Sends a post request expecting a failure. expected_status_code should be whatever code is expected for this call - [Arguments] ${request_file} ${expected_status_code} ${template_folder} + [Arguments] ${request_file} ${expected_status_code} ${template_folder} ${variables}=[] ${uuid}= Generate UUID ${resp}= Create Schedule ${uuid} ${request_file} ${template_folder} Should Be Equal as Strings ${resp.status_code} ${expected_status_code} Return from Keyword If '${resp.status_code}' == '202' #List of possible reasons that the request should fail - we should look for exact message..... @{status_list}= Create List Scheduler.INVALID_ATTRIBUTE Scheduler.MISSING_REQUIRED_ATTRIBUTE Scheduler.NODE_LIST_CONTAINS_EMTPY_NODE Scheduler.INVALID_CHANGE_WINDOW - Validate Json Error ${resp.json()} ${status_list} + @{listVars}= Evaluate ${variables} + Validate Json Error ${resp.json()} ${status_list} ${listVars} Change Management Immediate Template [Arguments] ${request_file} ${expected_status_code} ${template_folder} diff --git a/cmso-service/etc/config/cmso.properties b/cmso-service/etc/config/cmso.properties index d4a78e8..e9bec86 100644 --- a/cmso-service/etc/config/cmso.properties +++ b/cmso-service/etc/config/cmso.properties @@ -52,9 +52,9 @@ spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.Ph spring.jpa.hibernate.id.new_generator_mappings=false
hibernate.id.new_generator_mappings=false
-logging.level.org.hibernate.SQL=TRACE
+logging.level.org.hibernate.SQL=WARN
-logging.level.org.hibernate=TRACE
+logging.level.org.hibernate=WARN
#
cmso.aaf.enabled=false
diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java index ff27937..4fd0164 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/optimizer/CmsoOptimizerClient.java @@ -181,8 +181,12 @@ public class CmsoOptimizerClient { // Scheduled with optimizer break; case 200: - debug.debug("Successfully completed optimization: " + schedule.getScheduleId()); - // Scheduled with optimizer + String optimizerResponseString = response.readEntity(String.class); + ObjectMapper om = new ObjectMapper(); + OptimizerResponse optimizerResponse = + om.readValue(optimizerResponseString, OptimizerResponse.class); + debug.debug("Successfully retrieved optimization: " + schedule.getScheduleId()); + optimizerHandler.handleOptimizerResponse(optimizerResponse, schedule); break; case 400: { schedule.setOptimizerDateTimeMillis(System.currentTimeMillis()); diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java index 4fccf7e..9b3785a 100644 --- a/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java +++ b/cmso-service/src/main/java/org/onap/optf/cmso/service/rs/CmsoServiceImpl.java @@ -233,6 +233,7 @@ public class CmsoServiceImpl extends CommonServiceImpl implements CmsoService { List<PolicyInfo> policies = new ArrayList<>(); PolicyInfo policyInfo = new PolicyInfo(); policyInfo.setPolicyName(sinfo.getPolicyId()); + policies.add(policyInfo); sd.setPolicies(policies); List<VnfDetailsMessage> details = sinfo.getVnfDetails(); diff --git a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java index b9ab733..8d167f2 100644 --- a/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java +++ b/cmso-topology/src/main/java/org/onap/optf/cmso/topology/service/rs/TopologyInterfaceImpl.java @@ -78,8 +78,7 @@ public class TopologyInterfaceImpl implements TopologyInterface { ElementInfo element = new ElementInfo(); element.setElementId(criteria.getElementId()); ElementLocation loc = new ElementLocation(); - loc.setLat(new Float(-74.024)); - loc.setLon(new Float(40.177)); + loc.setTimezone("US/Eastern"); element.setElementLocation(loc); atr.getElements().add(element); } |