X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=vpnservice.git;a=blobdiff_plain;f=neutronvpn%2Fneutronvpn-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Fneutronvpn%2FNeutronNetworkChangeListener.java;h=fd3111aee65fe178d68489eaedb8db17115981f2;hp=4a474f35bcc6dc8965e5c487b44dc338b0ab0836;hb=2ef3711b19264a9edfa95713d7bb33b79b699712;hpb=769edd5c7e8cfa0a13a2f8e442270978f649b83f

diff --git a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronNetworkChangeListener.java b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronNetworkChangeListener.java
index 4a474f35..fd3111ae 100644
--- a/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronNetworkChangeListener.java
+++ b/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/vpnservice/neutronvpn/NeutronNetworkChangeListener.java
@@ -76,7 +76,7 @@ public class NeutronNetworkChangeListener extends AbstractDataChangeListener<Net
             LOG.trace("Adding Network : key: " + identifier + ", value=" + input);
         }
         //Create ELAN instance for this network
-        createElanInstance(input.getUuid().getValue());
+        createElanInstance(input);
     }
 
     @Override
@@ -96,13 +96,19 @@ public class NeutronNetworkChangeListener extends AbstractDataChangeListener<Net
         }
     }
 
-    private void createElanInstance(String elanInstanceName) {
-        ElanInstance elanInstance = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName).setKey(new
-                ElanInstanceKey(elanInstanceName)).build();
+    private void createElanInstance(Network input) {
+        String elanInstanceName = input.getUuid().getValue();
+        String segmentationId = NeutronvpnUtils.getSegmentationIdFromNeutronNetwork(input);
+        ElanInstanceBuilder elanInstanceBuilder = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName);
+        if (segmentationId != null) {
+            //TODO: Uncomment below line while ELAN changes are ported
+            //elanInstanceBuilder.setVni(Long.valueOf(segmentationId));
+        }
+        elanInstanceBuilder.setKey(new ElanInstanceKey(elanInstanceName));
+        ElanInstance elanInstance = elanInstanceBuilder.build();
         InstanceIdentifier<ElanInstance> id = InstanceIdentifier.builder(ElanInstances.class)
                 .child(ElanInstance.class, new ElanInstanceKey(elanInstanceName)).build();
         MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, id, elanInstance);
-
     }
 
     private void deleteElanInstance(String elanInstanceName) {