2 files changed, 4 insertions, 15 deletions
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java b/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java
index c9d12a3..6800626 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java
@@ -50,14 +50,14 @@ public class SoClient {
   @Value("${so.host}")
   private String soHostname;
 
-  @Value("${so.api.id}")
-  private String soApiId;
+  @Value("${so.onap.partner.name}")
+  private String soOnapPartnerName;
 
   @Value("${so.header.authorization}")
   private String soHeaderAuthorization;
 
   private static final String HEADER_AUTHORIZATION = "Authorization";
-  private static final String X_FROM_APP_ID = "X-FromAppId";
+  private static final String X_ONAP_PARTNER_HEADER = "X-ONAP-PartnerName";
 
   private static final Logger LOGGER = LoggerFactory.getLogger(SoClient.class);
 
@@ -334,7 +334,7 @@ public class SoClient {
   private HttpHeaders buildRequestHeader() {
     HttpHeaders httpHeaders = new HttpHeaders();
     httpHeaders.add(HEADER_AUTHORIZATION, soHeaderAuthorization);
-    httpHeaders.add(X_FROM_APP_ID, soApiId);
+    httpHeaders.add(X_ONAP_PARTNER_HEADER, soOnapPartnerName);
     httpHeaders.add("Accept", "application/json");
     httpHeaders.add("Content-Type", "application/json");
     return httpHeaders;
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java
index a80b1ee..82fb2c7 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java
@@ -19,8 +19,6 @@ public class RequestInfo {
 
     private String instanceName;
 
-    private String productFamilyId;
-
     private String source;
 
     private boolean suppressRollback;
@@ -35,14 +33,6 @@ public class RequestInfo {
         this.instanceName = instanceName;
     }
 
-    public String getProductFamilyId() {
-        return productFamilyId;
-    }
-
-    public void setProductFamilyId(String productFamilyId) {
-        this.productFamilyId = productFamilyId;
-    }
-
     public String getSource() {
         return source;
     }
@@ -71,7 +61,6 @@ public class RequestInfo {
     public String toString() {
         return "RequestInfo{" +
             "instanceName='" + instanceName + '\'' +
-            ", productFamilyId='" + productFamilyId + '\'' +
             ", source='" + source + '\'' +
             ", suppressRollback=" + suppressRollback +
             ", requestorId='" + requestorId + '\'' +