Fix bugs caused by YANG parser's update

Patch Set 2: Fix checkstyle

Change-Id: I134289e84c43fb8930067f26c2c138242e8523f3
Signed-off-by: Xiao Lin <linxiao9292@outlook.com>
Signed-off-by: jensenzhang <jingxuan.n.zhang@gmail.com>

diff --git a/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang b/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang
index 46f630b76ccaac7344874be574e948ddbfcbf354..c1d45bf4b6bfe3d12a5e599ea6484a821eeef269 100644 (file)
--- a/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang
+++ b/alto-basic/simple-ird/api/src/main/yang/alto-simple-ird-rfc7285.yang
@@ -83,8 +83,6 @@ module alto-simple-ird-rfc7285 {
     augment "/ird:ird-instance" {
         ext:augment-identifier "rfc7285-ird-metadata";
 
-        config false;
-
         container "meta" {
             uses "rfc7285-ird-meta";
         }

diff --git a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java
index 52e23fa40b5df2256d3443549908eecd53b4e7f8..cfdfbd237a9bf21f211d772b6bc0fa87739648b8 100644 (file)
--- a/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java
+++ b/alto-basic/simple-ird/impl/src/main/java/org/opendaylight/alto/basic/impl/rfc7285/SimpleIrdRfc7285DefaultNetworkMapListener.java
@@ -136,7 +136,13 @@ public final class SimpleIrdRfc7285DefaultNetworkMapListener
         InstanceIdentifier<Rfc7285IrdMetadata> iid;
         iid = SimpleIrdUtils.getInstanceIID(instanceId).augmentation(Rfc7285IrdMetadata.class);
 
-        Optional<Rfc7285IrdMetadata> metadata = rx.read(LogicalDatastoreType.OPERATIONAL, iid).get();
+        Optional<Rfc7285IrdMetadata> metadata = Optional.absent();
+        try {
+        metadata = rx.read(LogicalDatastoreType.OPERATIONAL, iid).get();
+    } catch (InterruptedException | ExecutionException e) {
+        throw e;
+    } catch (Exception e) {
+    }
 
         if (metadata.isPresent()) {
             return metadata.get().getMeta().getDefaultNetworkMap();

diff --git a/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang b/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang
index 8230e9b0913583380777fafefcaa5680290f197a..daa6eb9489b8a57b6057c18c7bcc6144263b972b 100644 (file)
--- a/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang
+++ b/alto-core/resourcepool/api/src/main/yang/alto-resourcepool.yang
@@ -81,10 +81,10 @@ module alto-resourcepool {
                 yang-ext:context-instance "service-context";
 
                 leaf-list "dependency" {
+                    description
+                        "Should point to a ../../../resource/context-tag instance (in the same context)";
                     type instance-identifier {
                         require-instance true;
-                        description
-                            "Should point to a ../../../resource/context-tag instance (in the same context)";
                     }
                 }
             }