Update db process part

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / init / EnvVariablesInitialization.java

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java
index eddc51a..81cc281 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/init/EnvVariablesInitialization.java
@@ -51,23 +51,27 @@ public class EnvVariablesInitialization implements ApplicationRunner {
                        return;
                }
                
-               try {
-                       handleAaiMsbServiceInfo();
-               } catch (Exception e) {
-                       logger.error("handleAaiMsbServiceInfo error", e);
-               }
-               
-               try {
-                       handLcmMsbServiceInfo();
-               } catch (Exception e) {
-                       logger.error("handLcmMsbServiceInfo error", e);
-               }
+               adaptorEnv.setAaiApiUriFront(adaptorEnv.getMsbApiUriFront());
+               adaptorEnv.setLcmApiUriFront(adaptorEnv.getMsbApiUriFront());
+               adaptorEnv.setCatalogApiUriFront(adaptorEnv.getMsbApiUriFront());
                
-               try {
-                       handCatalogMsbServiceInfo();
-               } catch (Exception e) {
-                       logger.error("handCatalogMsbServiceInfo error", e);
-               }
+//             try {
+//                     handleAaiMsbServiceInfo();
+//             } catch (Exception e) {
+//                     logger.error("handleAaiMsbServiceInfo error", e);
+//             }
+//             
+//             try {
+//                     handleLcmMsbServiceInfo();
+//             } catch (Exception e) {
+//                     logger.error("handleLcmMsbServiceInfo error", e);
+//             }
+//             
+//             try {
+//                     handleCatalogMsbServiceInfo();
+//             } catch (Exception e) {
+//                     logger.error("handleCatalogMsbServiceInfo error", e);
+//             }
                
        }
 
@@ -86,13 +90,13 @@ public class EnvVariablesInitialization implements ApplicationRunner {
                return CommonConstants.SCHEMA_HTTP + "://" + adaptorEnv.getMsbIp() + ":" + adaptorEnv.getMsbPort();
        }
        
-       private void handLcmMsbServiceInfo() throws ClientProtocolException, IOException {
+       private void handleLcmMsbServiceInfo() throws ClientProtocolException, IOException {
                String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getLcmServiceNameInMsb(), adaptorEnv.getLcmVersionInMsb());
                adaptorEnv.setLcmUrlInMsb(urlInMsb);
                adaptorEnv.setLcmApiUriFront(generateApiUriFront(urlInMsb));
        }
        
-       private void handCatalogMsbServiceInfo() throws ClientProtocolException, IOException {
+       private void handleCatalogMsbServiceInfo() throws ClientProtocolException, IOException {
                String urlInMsb = msbMgmr.getServiceUrlInMsbBySeriveNameAndVersion(adaptorEnv.getCatalogServiceNameInMsb(), adaptorEnv.getCatalogVersionInMsb());
                adaptorEnv.setCatalogUrlInMsb(urlInMsb);
                adaptorEnv.setCatalogApiUriFront(generateApiUriFront(urlInMsb));