Purge internal map variables by leveraging persistent store

Change-Id: If347de18803a6f84a220e1ffdee26b9e1c28634b
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java
index 7ad2b02..2383e62 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/InstancePortManager.java
@@ -247,8 +247,8 @@
                         createInstancePort(instPort);
                     } else {
                         // the instance was restarted
-                        if (existingPort.state() == InstancePort.State.INACTIVE) {
-                            updateInstancePort(existingPort.updateState(ACTIVE));
+                        if (existingPort.state() == INACTIVE) {
+                            updateInstancePort(instPort);
                         }
                     }
                     break;
@@ -276,7 +276,7 @@
 
                         if (location != null) {
                             InstancePort updated = instPort.updateState(MIGRATED);
-                            updateInstancePort(updated.updatePrevData(
+                            updateInstancePort(updated.updatePrevLocation(
                                         location.deviceId(), location.port()));
                         }
                     }