Code Review / netvirt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
MRI version bumpup for Aluminium
[netvirt.git] / neutronvpn / shell / src / main / java / org / opendaylight / netvirt / neutronvpn / shell / ShowSubnet.java
diff --git a/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java
index 11f3c5427ea9dafd7bf8d497285ccabcacfc900c..14a962c2737ff805aa6f9fedd4db12f2b4277018 100644 (file)
--- a/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java
+++ b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java
@@ -7,23 +7,23 @@
  */
 package org.opendaylight.netvirt.neutronvpn.shell;
 
-import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION;
-import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.OPERATIONAL;
 import static org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker.syncReadOptional;
+import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION;
+import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL;
 
-import com.google.common.base.Optional;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.SubnetOpData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.subnet.op.data.SubnetOpDataEntry;
@@ -88,7 +88,7 @@ public class ShowSubnet extends OsgiCommandSupport {
             SubnetOpDataEntry data = optionalSubs.get();
             System.out.println("Fetching subnetmap for given subnetId\n");
             System.out.println("------------------------------------------------------------------------------");
-            System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: "
+            System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: "
                 + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n" + "RouteAdvState: "
                 + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n"
                 + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " + data.getVpnName() + "\n");
@@ -100,12 +100,12 @@ public class ShowSubnet extends OsgiCommandSupport {
             Optional<SubnetOpDataEntry> optionalSubnetOpDataEntries =
                 syncReadOptional(dataBroker, OPERATIONAL, subOpIdentifier);
             if (optionalSubnetOpDataEntries.isPresent()) {
-                optionalSubnetOpDataEntries.asSet().forEach(subnetOpDataEntry -> {
+                Collections.singleton(optionalSubnetOpDataEntries.get()).forEach(subnetOpDataEntry -> {
                     SubnetOpDataEntry data = subnetOpDataEntry;
                     System.out.println("Fetching subnetmapdataentry for given subnetId\n");
                     System.out.println("------------------------"
                                   + "------------------------------------------------------");
-                    System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n"
+                    System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n"
                         + "ElanTag: " + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n"
                         + "RouteAdvState: " + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr()
                         + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: "
@@ -124,7 +124,7 @@ public class ShowSubnet extends OsgiCommandSupport {
             System.out.println("------------------------------------------------------------------------------");
             String getRouterInterfacePortId = (data.getRouterInterfacePortId() != null
                        ? data.getRouterInterfacePortId().getValue() : "null");
-            System.out.println("Key: " + data.getKey() + "\n" + "VpnId: " + data.getVpnId() + "\n"
+            System.out.println("Key: " + data.key() + "\n" + "VpnId: " + data.getVpnId() + "\n"
                     + "InternetVpnId: " + data.getInternetVpnId() + "\n"
                     + "DirectPortList: " + data.getDirectPortList() + "\n" + "NetworkId: " + data.getNetworkId()
                     + "\n" + "Network-type: " + data.getNetworkType() + "\n" + "Network-segmentation-Id: "
@@ -143,7 +143,7 @@ public class ShowSubnet extends OsgiCommandSupport {
             System.out.println("------------------------------------------------------------------------------");
             String getRouterInterfacePortId = (data.getRouterInterfacePortId() != null
                        ? data.getRouterInterfacePortId().getValue() : "null");
-            System.out.println("Key: " + data.getKey() + "\n" + "VpnId: " + data.getVpnId() + "\n"
+            System.out.println("Key: " + data.key() + "\n" + "VpnId: " + data.getVpnId() + "\n"
                     + "InternetVpnId: " + data.getInternetVpnId() + "\n"
                     + "DirectPortList: " + data.getDirectPortList() + "\n" + "NetworkId: " + data.getNetworkId()
                     + "\n" + "Network-type: " + data.getNetworkType() + "\n" + "Network-segmentation-Id: "
@@ -160,7 +160,7 @@ public class ShowSubnet extends OsgiCommandSupport {
             SubnetOpDataEntry data = optionalSubs.get();
             System.out.println("Fetching subnetmap for given subnetId\n");
             System.out.println("------------------------------------------------------------------------------");
-            System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: "
+            System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: "
                 + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n" + "RouteAdvState: "
                 + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n"
                 + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " + data.getVpnName() + "\n");
@@ -184,14 +184,15 @@ public class ShowSubnet extends OsgiCommandSupport {
                     InstanceIdentifier.builder(SubnetOpData.class).build();
             Optional<SubnetOpData> optionalSubnetOpData = syncReadOptional(dataBroker, OPERATIONAL, subOpIdentifier);
             if (optionalSubnetOpData.isPresent()) {
-                List<SubnetOpDataEntry> subnetOpDataEntryList = optionalSubnetOpData.get().getSubnetOpDataEntry();
+                List<SubnetOpDataEntry> subnetOpDataEntryList
+                        = new ArrayList<SubnetOpDataEntry>(optionalSubnetOpData.get().getSubnetOpDataEntry().values());
                 System.out.println("number of subnetOpDataEntry found are : " + subnetOpDataEntryList + "\n");
                 subnetOpDataEntryList.forEach(subnetOpDataEntry -> {
                     SubnetOpDataEntry data = subnetOpDataEntry;
                     System.out.println("Fetching subnetmap for given subnetId\n");
                     System.out.println("------------------------"
                                   + "------------------------------------------------------");
-                    System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n"
+                    System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n"
                         + "ElanTag: " + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n"
                         + "RouteAdvState: " + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr()
                         + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: "
@@ -207,9 +208,9 @@ public class ShowSubnet extends OsgiCommandSupport {
             InstanceIdentifier<Subnetmaps> subMapIdentifier = InstanceIdentifier.builder(Subnetmaps.class).build();
             Optional<Subnetmaps> optionalSubnetmaps =  syncReadOptional(dataBroker, CONFIGURATION, subMapIdentifier);
             if (optionalSubnetmaps.isPresent()) {
-                List<Subnetmap> subnetMapList = optionalSubnetmaps.get().getSubnetmap();
-                System.out.println("number of subnetmaps found are : " + subnetMapList.size() + "\n");
-                subnetMapList.forEach(sn -> {
+                Map<SubnetmapKey, Subnetmap> keySubnetmapMap = optionalSubnetmaps.get().getSubnetmap();
+                System.out.println("number of subnetmaps found are : " + keySubnetmapMap.size() + "\n");
+                keySubnetmapMap.values().forEach(sn -> {
                     if (sn != null) {
                         System.out.println("Fetching subnetmap for given subnetId\n");
                         System.out.println("------------------------"
@@ -251,7 +252,7 @@ public class ShowSubnet extends OsgiCommandSupport {
     }
 
     @SuppressWarnings("checkstyle:RegexpSinglelineJava")
-    private void getSubnet() throws ReadFailedException {
+    private void getSubnet() throws ExecutionException, InterruptedException {
         List<SubnetOpDataEntry> subnetOpDataEntryList = new ArrayList<>();
         InstanceIdentifier<Subnetmaps> subnetmapsid = InstanceIdentifier.builder(Subnetmaps.class).build();
         InstanceIdentifier<SubnetOpData> subOpIdentifier = InstanceIdentifier.builder(SubnetOpData.class).build();
@@ -259,14 +260,15 @@ public class ShowSubnet extends OsgiCommandSupport {
         if (!optionalSubnetmaps.isPresent()) {
             System.out.println("No Subnetmaps configured.");
         } else {
-            subnetmapList = optionalSubnetmaps.get().getSubnetmap();
+            subnetmapList = new ArrayList<Subnetmap>(optionalSubnetmaps.get().getSubnetmap().values());
         }
 
         Optional<SubnetOpData> optionalSubnetOpData = syncReadOptional(dataBroker, OPERATIONAL, subOpIdentifier);
         if (!optionalSubnetOpData.isPresent()) {
             System.out.println("No SubnetOpData configured.");
         } else {
-            subnetOpDataEntryList = optionalSubnetOpData.get().getSubnetOpDataEntry();
+            subnetOpDataEntryList
+                    = new ArrayList<SubnetOpDataEntry>(optionalSubnetOpData.get().getSubnetOpDataEntry().values());
         }
 
         for (SubnetOpDataEntry subnetOpDataEntry : subnetOpDataEntryList) {
NetVirt - Archived