aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-adapters-rest-interface/src
diff options
context:
space:
mode:
authorBoslet, Cory <cory.boslet@att.com>2020-01-15 16:05:12 -0500
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-01-15 16:05:12 -0500
commitfe350c06cb12d14e87d4060d5fc9cee97ed31987 (patch)
tree3dc47dcb609f95905e7fe3fe9eb90d127b705424 /adapters/mso-adapters-rest-interface/src
parente6d05b9359582d2a8bddfeb73527d134586410b7 (diff)
Use the timeout from the heat template instead of
Use the timeout from the heat template instead of hardcode WIP Added custom uuid to vf adapter delete rest request Added and fixed compilations errors due to interface change added logic to check that the timeout is less than 120 Set the cust model uuid in bpmn so its avaiable to adapter. Added to use timeout from heat template for network. Updated unit test to account for new param change to method. Fixed and added missing param to deletevf in vnfadapterrestv2 Fixed failing junits due to adding model cust id to request Issue-ID: SO-2601 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I6ac276f37d4b6423501fb07fe081828ea3bed235
Diffstat (limited to 'adapters/mso-adapters-rest-interface/src')
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java
index 6a979d754b..7e10bb3801 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java
@@ -7,9 +7,9 @@
* 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.
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
@XmlRootElement(name = "deleteVfModuleRequest")
public class DeleteVfModuleRequest extends VfRequestCommon implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = -8504083539107392561L;
private String cloudSiteId;
@@ -39,6 +39,7 @@ public class DeleteVfModuleRequest extends VfRequestCommon implements Serializab
private String vnfId;
private String vfModuleId;
private String vfModuleStackId;
+ private String modelCustomizationUuid;
private MsoRequest msoRequest = new MsoRequest();
@@ -94,6 +95,14 @@ public class DeleteVfModuleRequest extends VfRequestCommon implements Serializab
this.vfModuleStackId = vfModuleStackId;
}
+ public String getModelCustomizationUuid() {
+ return modelCustomizationUuid;
+ }
+
+ public void setModelCustomizationUuid(String modelCustomizationUuid) {
+ this.modelCustomizationUuid = modelCustomizationUuid;
+ }
+
public MsoRequest getMsoRequest() {
return msoRequest;
}