commit d02a5a76bdbacda0e73231d63af25cab1cad004d
author Hyunsun Moon <hyunsun.moon@gmail.com> Sun Feb 05 22:00:05 2017 +0900
committer Ali Al-Shabibi <ali@onlab.us> Wed Feb 15 09:34:02 2017 -0800
tree 74098741446fc48ee055bf2902d081d1cb3a7990
parent 525638167cdfc8bc27cc12614f7a7b476e7fed86

CORD-529, CORD-530 Allow VLAN and floating address pairs for PRIVATE network ports

And deprecated VSG network type

Change-Id: Ib0c1a2b1987463b3a6a4125e5aa7f4451eb51db8

src/main/java/org/opencord/cordvtn/impl/InstanceManager.java

diff --git a/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java b/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
index 2011342..b31a575 100644
--- a/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
+++ b/src/main/java/org/opencord/cordvtn/impl/InstanceManager.java
@@ -197,20 +197,8 @@
     }
 
     @Override
-    public void addNestedInstance(HostId hostId, HostDescription description) {
-        DefaultAnnotations annotations  = DefaultAnnotations.builder()
-                .set(Instance.NESTED_INSTANCE, Instance.TRUE)
-                .build();
-        annotations = annotations.merge(annotations, description.annotations());
-
-        HostDescription nestedHost = new DefaultHostDescription(
-                description.hwAddress(),
-                description.vlan(),
-                description.location(),
-                description.ipAddress(),
-                annotations);
-
-        hostProvider.hostDetected(hostId, nestedHost, false);
+    public void addInstance(HostId hostId, HostDescription description) {
+        hostProvider.hostDetected(hostId, description, false);
     }
 
     @Override
@@ -222,7 +210,7 @@
     }
 
     @Override
-    public void removeNestedInstance(HostId hostId) {
+    public void removeInstance(HostId hostId) {
         hostProvider.hostVanished(hostId);
     }