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 4b6f8edae1df04146ca6fc0779ee649e560d120d..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
@@ -19,7 +19,6 @@ 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;
@@ -185,7 +184,8 @@ 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;
@@ -208,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("------------------------"
@@ -260,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) {