Merge "Adding Junit"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / java / org / openecomp / mso / bpmn / infrastructure / workflow / serviceTask / client / entity / NetworkRequestInputEntity.java

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java
index f5df5cb..b0733f7 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java
+++ b/bpmn/MSOInfrastructureBPMN/src/main/java/org/openecomp/mso/bpmn/infrastructure/workflow/serviceTask/client/entity/NetworkRequestInputEntity.java
@@ -22,22 +22,22 @@ package org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.client.entity
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-/**
- * Created by 10112215 on 2017/9/20.
- */
 public class NetworkRequestInputEntity {
-    @JsonProperty("network-name")
+    @JsonProperty("GENERIC-RESOURCE-API:network-name")
     private String networkName;
 
-    @JsonProperty("tenant")
+    @JsonProperty("GENERIC-RESOURCE-API:tenant")
     private String tenant;
 
-    @JsonProperty("aic-cloud-region")
+    @JsonProperty("GENERIC-RESOURCE-API:aic-cloud-region")
     private String aicCloudRegion;
 
-    @JsonProperty("aic-clli")
+    @JsonProperty("GENERIC-RESOURCE-API:aic-clli")
     private String aicClli;
 
+    @JsonProperty("GENERIC-RESOURCE-API:network-input-parameters")
+    private NetworkInputPaarametersEntity networkInputPaarameters;
+
     public String getNetworkName() {
         return networkName;
     }
@@ -77,7 +77,4 @@ public class NetworkRequestInputEntity {
     public void setNetworkInputPaarameters(NetworkInputPaarametersEntity networkInputPaarameters) {
         this.networkInputPaarameters = networkInputPaarameters;
     }
-
-    @JsonProperty("network-input-parameters")
-    private NetworkInputPaarametersEntity networkInputPaarameters;
 }