Merge pull request #286 from rvilalta/master

Solved bug with wrong type of log (from info to error).
sonata-nfv · Dec 24, 2019 · 6260129 · 6260129
2 parents f223014 + 10b5459
commit 6260129
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 12 deletions.
diff --git a/NST_examples/Demo-Comm-Pilot/comm_pilot_nst.json b/NST_examples/Demo-Comm-Pilot/comm_pilot_nst.json
@@ -15,16 +15,7 @@
       "nsd-vendor": "quobis",
       "nsd-version": "0.5",
       "is-shared": false,
-      "ingresses": [
-        {
-          "location": "9c21ec84-a834-404f-942e-43fa190a8734",
-          "nap": "10.10.10.1/32"
-        },
-        {
-          "location": "273c4fff-3c5f-406e-a1ee-450099d3a60c",
-          "nap": "10.10.10.2/32"
-        }
-      ],
+      "ingresses": [],
       "egresses": []
     }
   ],

diff --git a/doc/images/Instant_Params_1.PNG b/doc/images/Instant_Params_1.PNG
diff --git a/doc/images/Instant_Params_2.PNG b/doc/images/Instant_Params_2.PNG
diff --git a/doc/images/Instant_Params_3.PNG b/doc/images/Instant_Params_3.PNG
diff --git a/doc/images/Instant_Params_4.PNG b/doc/images/Instant_Params_4.PNG
diff --git a/doc/images/Instant_Params_5.PNG b/doc/images/Instant_Params_5.PNG
diff --git a/doc/images/Instant_Params_6.PNG b/doc/images/Instant_Params_6.PNG
diff --git a/doc/images/Instant_Params_7.PNG b/doc/images/Instant_Params_7.PNG
diff --git a/slice_lifecycle_mgr/nsi_manager.py b/slice_lifecycle_mgr/nsi_manager.py
@@ -508,6 +508,7 @@ def update_nsi_notify_instantiate(self):
       else:
         # errors are managed in the main thread function (run)
         jsonNSI['nsi-status'] = 'ERROR'
+        #TODO: check if any nsr is being instantiated and wait until 
 
       # sends the updated NetSlice instance to the repositories
       jsonNSI['updateTime'] = str(datetime.datetime.now().isoformat())
@@ -629,7 +630,7 @@ def run(self):
 
           # if all services are instantiated, break the while and proceed with the last steps
           if nsrs_instantiated:
-            LOG.info("ALL Network Service Instantiations belonging to slice: " +str(self.NSI['id'])+ " were well processed.")
+            LOG.info("ALL Network Service Instantiations belonging to slice: " +str(self.NSI['id'])+ " were processed.")
             break
 
           time.sleep(15)
@@ -661,7 +662,7 @@ def run(self):
         # FUTURE TODO: ensure this "undo" process is well done.         
         # undoes everything done until this moment (nsrs, and vlds)
         if nsr_error == True or wim_ready == False:
-          LOG.info("ERROR while instantiating slice "+str(self.NSI['id'])+", undoing all the created objects (nsrs and vlds).")
+          LOG.error("ERROR while instantiating slice "+str(self.NSI['id'])+", undoing all the created objects (nsrs and vlds).")
           # acquires mutex to have unique access to the nsi (repositories)
           mutex_slice2db_access.acquire()