Modify service register part

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / msb / impl / MsbMgmrImpl.java

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
index 8f668c2..5d48885 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 
 @Component
@@ -46,16 +47,19 @@ public class MsbMgmrImpl implements IMsbMgmr {
        public void register() {
                try {
                        String vfcAdaptorInfoJsonStr = readVfcAdaptorInfoFromJsonFile();
-                       MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+//                     MicroServiceInfo msinfo = gson.fromJson(vfcAdaptorInfoJsonStr, MicroServiceInfo.class);
+                       
+                       JSON json = com.alibaba.fastjson.JSON.parseObject(vfcAdaptorInfoJsonStr);
+                       MicroServiceInfo msinfo = com.alibaba.fastjson.JSON.toJavaObject(json , MicroServiceInfo.class);
                        
                        MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
                        MicroServiceFullInfo microServiceInfo = msbClient.registerMicroServiceInfo(msinfo);
                        logger.info("Registered service response info is " + microServiceInfo.toString());
                        
-               } catch (IOException e) {
-                       logger.error("Failed to read vfcadaptor info! ", e);
                } catch (RouteException e) {
-                       logger.error("Failed to register nokia vnfm driver! ", e);
+                       logger.error("RouteException Failed to register nokia vnfm driver! ", e);
+               } catch (IOException e) {
+                       logger.error("IOException Failed to register nokia vnfm driver! ", e);
                }
                        
        }
@@ -86,22 +90,29 @@ public class MsbMgmrImpl implements IMsbMgmr {
        
    public String getServiceUrlInMsbBySeriveNameAndPort(String serviceName, String version) throws RouteException
    {
+          String serviceUrl = null;
           MSBServiceClient msbClient = new MSBServiceClient(adaptorEnv.getMsbIp(), adaptorEnv.getMsbPort());
           MicroServiceFullInfo microServiceInfo = msbClient.queryMicroServiceInfo(serviceName, version);
           if(null == microServiceInfo)
           {
                   logger.error("There is no service in MSB for serviceName = {} and version = {}", serviceName, version);
           }
-          
-          String serviceUrl = microServiceInfo.getUrl();
-               logger.info("Service Url in MSB for serviceName = {} and version = {} is {}", serviceName, version, serviceUrl);
-               
-               return serviceUrl;
+          else
+          {
+                  serviceUrl = microServiceInfo.getUrl();
+                  logger.info("Service Url in MSB for serviceName = {} and version = {} is {}", serviceName, version, serviceUrl);
+          }
+          return serviceUrl;
                
    }
 
        public void setAdaptorEnv(AdaptorEnv env) {
                this.adaptorEnv = env;
        }
+       
+       public static final void main(String[] args) {
+               MsbMgmrImpl impl = new MsbMgmrImpl();
+               impl.register();
+       }
 
 }