Merge "More unit tests for CatalogDatabase III"
diff --git a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java
index 45ca91f..06d5328 100644
--- a/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestParameters.java
@@ -51,6 +51,8 @@
private Boolean rebuildVolumeGroups;
@JsonProperty("payload")
private String payload;
+ @JsonProperty("controllerType")
+ private String controllerType;
public String getSubscriptionServiceType() {
return subscriptionServiceType;
@@ -132,13 +134,19 @@
this.payload = value;
}
+ public String getControllerType() {
+ return controllerType;
+ }
+
+ public void setControllerType(String controllerType) {
+ this.controllerType = controllerType;
+ }
+
@Override
public String toString() {
- return "RequestParameters [subscriptionServiceType="
- + subscriptionServiceType + ", userParams=" + userParams
- + ", aLaCarte=" + aLaCarte + ", autoBuildVfModules="
- + autoBuildVfModules + ", usePreload="
- + usePreload + ", rebuildVolumeGroups="
- + rebuildVolumeGroups + ", payload=" + payload + "]";
+ return "RequestParameters [subscriptionServiceType=" + subscriptionServiceType + ", userParams=" + userParams
+ + ", aLaCarte=" + aLaCarte + ", autoBuildVfModules=" + autoBuildVfModules + ", cascadeDelete="
+ + cascadeDelete + ", usePreload=" + usePreload + ", rebuildVolumeGroups=" + rebuildVolumeGroups
+ + ", payload=" + payload + ", controllerType=" + controllerType + "]";
}
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json
index d0613fc..0fc5355 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/UserParams.json
@@ -46,6 +46,7 @@
}],
"requestParameters": {
"usePreload": true,
+ "controllerType": "appc",
"userParams": [{
"name": "vlc_sctp_b_route_prefixes",
"value": [