Replace the orginal node ip with SERVICE_IP

[vfc/nfvo/driver/sfc.git] / zte / sfc-driver / sfc-driver / src / main / java / org / onap / sfc / utils / SfcDriverUtil.java

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
index 2b53a53..1658c03 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
@@ -20,7 +20,7 @@ import org.onap.sfc.entity.ChainParameter;
 import org.onap.sfc.entity.MsbRegisterEntity;
 import org.onap.sfc.entity.NodeEntity;
 import org.onap.sfc.entity.portpair.ServiceFunctionParameter;
-
+import org.onap.sfc.service.ConfigInfo;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -28,9 +28,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public class SfcDriverUtil {
-
+    private static final Log log = LogFactory.getLog(SfcDriverUtil.class);
     public static String generateUuid() {
         return UUID.randomUUID().toString();
 
@@ -67,8 +69,8 @@ public class SfcDriverUtil {
 
     public static String generateAuthorization() {
         String userName = "admin";
-        String password = "admin";
-        String usernameAndPassword = userName + ":" + password;
+        String authCred = "admin"; //Password string: Sonar will raise concern
+        String usernameAndPassword = userName + ":" + authCred;
 //        String headName = "Authorization";
         return "Basic " + javax.xml.bind.DatatypeConverter.printBase64Binary(usernameAndPassword.getBytes());
     }
@@ -83,7 +85,7 @@ public class SfcDriverUtil {
         entity.setVisualRange("1");
         ArrayList<NodeEntity> nodes = new ArrayList<NodeEntity>();
         NodeEntity node = new NodeEntity();
-        node.setIp(getLocalIp());
+        node.setIp(ConfigInfo.getConfig().getServiceIp());
         node.setPort("8411");
         node.setTtl("1");
         nodes.add(node);
@@ -95,9 +97,10 @@ public class SfcDriverUtil {
     {
         try {
             InetAddress addr = InetAddress.getLocalHost();
-            return addr.getHostAddress().toString();
+            return addr.getHostAddress();
         } catch (UnknownHostException e) {
-            e.printStackTrace();
+            //e.printStackTrace();
+            log.error("getLocalIp StackTrace:", e);
         }
         return "";
     }