summaryrefslogtreecommitdiffstats
path: root/common/src
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-11-15 00:37:03 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-15 00:37:03 +0000
commitce7d16089439d570c1c12764f7cd2372547d69f1 (patch)
tree233c2b4bdc1c0debb115b630cf5cbdee896dec69 /common/src
parent9f934386f04d1583d1a1833f025a0eed396507ea (diff)
parent6b405cd8bfab89ccc6d93eaa0e2a13cda9ecc9a3 (diff)
Merge "accept a la carte create instance group request"
Diffstat (limited to 'common/src')
-rw-r--r--common/src/main/java/org/onap/so/logger/MsoLogger.java1
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java3
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java3
-rw-r--r--common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java10
4 files changed, 13 insertions, 4 deletions
diff --git a/common/src/main/java/org/onap/so/logger/MsoLogger.java b/common/src/main/java/org/onap/so/logger/MsoLogger.java
index c4fba671bb..39a23b5c3e 100644
--- a/common/src/main/java/org/onap/so/logger/MsoLogger.java
+++ b/common/src/main/java/org/onap/so/logger/MsoLogger.java
@@ -74,6 +74,7 @@ public class MsoLogger {
public static final String ONAP_REQUEST_ID = "X-ONAP-RequestID";
public static final String CLIENT_ID = "X-ClientID";
public static final String INVOCATION_ID_HEADER = "X-InvocationID";
+ public static final String REQUESTOR_ID = "X-RequestorID";
//Default values for not found
public static final String UNKNOWN_PARTNER = "UnknownPartner";
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java
index 1e5124bf1f..754a70ee94 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java
@@ -32,5 +32,6 @@ public enum ModelType {
configuration,
connectionPoint,
pnf,
- networkInstanceGroup
+ networkInstanceGroup,
+ instanceGroup
}
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java
index 158ca7a819..fd7877822b 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/RequestInfo.java
@@ -162,9 +162,6 @@ public class RequestInfo implements Serializable {
*
*/
public String getSource() {
- if(null == source || source.isEmpty()){
- source = "VID";
- }
return source;
}
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java b/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java
index 3ccf29127f..b6bfda159d 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/ServiceInstancesRequest.java
@@ -43,6 +43,8 @@ public class ServiceInstancesRequest implements Serializable {
private String configurationId;
@JsonProperty("correlationId")
private String correlationId;
+ @JsonProperty("instanceGroupId")
+ private String instanceGroupId;
public RequestDetails getRequestDetails() {
return requestDetails;
@@ -107,6 +109,14 @@ public class ServiceInstancesRequest implements Serializable {
public void setCorrelationId(String correlationId) {
this.correlationId = correlationId;
}
+
+ public String getInstanceGroupId() {
+ return instanceGroupId;
+ }
+
+ public void setInstanceGroupId(String instanceGroupId) {
+ this.instanceGroupId = instanceGroupId;
+ }
@Override
public String toString() {