Add *key ="uuid"* in lists loadbalancers, listeners, pools, members and healthmonitor...

Also, modify the *leaf id* to *leaf uuid* of grouping healthmonitor-attrs and member-attrs to have consistent key name.
Modify NeutronLoadBalancerHealthMonitorInterface to reflect the change (setId() to setUuid()).

Change-Id: I16baae46c1c0cb3e8a9232af57e89c4051c07b5f
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

diff --git a/model/src/main/yang/neutron-lbaasv2.yang b/model/src/main/yang/neutron-lbaasv2.yang
index e12c914c38eab2ec93b1122d64cc041b5fef63f5..8d2d994621d2b4b53806e2724af51773d62579f1 100644 (file)
--- a/model/src/main/yang/neutron-lbaasv2.yang
+++ b/model/src/main/yang/neutron-lbaasv2.yang
@@ -152,7 +152,7 @@ module neutron-lbaasv2 {
         }
     }
     grouping member-attrs {
-        leaf id {
+        leaf uuid {
             type yang:uuid;
             description "The unique ID for the member.";
         }
@@ -190,7 +190,7 @@ module neutron-lbaasv2 {
         }
     }
     grouping healthmonitor-attrs {
-        leaf id {
+        leaf uuid {
             type yang:uuid;
             description "The unique ID for the healthmonitor.";
         }
@@ -265,6 +265,7 @@ module neutron-lbaasv2 {
         container loadbalancer {
             description "Container for Loadbalancers.";
             list loadbalancers {
+                key "uuid";
                 uses attrs:base-attrs;
                 uses attrs:admin-attrs;
                 uses loadbalancer-attrs;
@@ -274,6 +275,7 @@ module neutron-lbaasv2 {
         container listener {
             description "Container for Listeners.";
             list listeners {
+                key "uuid";
                 uses attrs:base-attrs;
                 uses listener-attrs;
                 description "List of Listeners";
@@ -282,12 +284,14 @@ module neutron-lbaasv2 {
         container pool {
             description "Container for LBaaSV2.0 pools.";
             list pools {
+                key "uuid";
                 uses attrs:base-attrs;
                 uses pool-attrs;
                 description "List of Pools";
                 container member {
                     description "Container for pool members.";
                     list members {
+                        key "uuid";
                         uses member-attrs;
                         description "List of members.";
                     }
@@ -297,7 +301,7 @@ module neutron-lbaasv2 {
         container healthmonitor {
             description "Container for LBaaSV2.0 healthmonitors.";
             list healthmonitors {
-                key "id";
+                key "uuid";
                 uses healthmonitor-attrs;
                 description "List of healthmonitors.";
             }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
index 7701efd40b8d73e510d23850c9fb9863ea12ceba..cb6a210e5ac04a038e49f8c5ada291b622351146 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -131,7 +131,7 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
     @Override
     protected Healthmonitors toMd(String uuid) {
         HealthmonitorsBuilder healthmonitorsBuilder = new HealthmonitorsBuilder();
-        healthmonitorsBuilder.setId(toUuid(uuid));
+        healthmonitorsBuilder.setUuid(toUuid(uuid));
         return healthmonitorsBuilder.build();
     }
 
@@ -179,7 +179,7 @@ public class NeutronLoadBalancerHealthMonitorInterface extends AbstractNeutronIn
             healthmonitorsBuilder.setUrlPath(healthMonitor.getLoadBalancerHealthMonitorUrlPath());
         }
         if (healthMonitor.getLoadBalancerHealthMonitorID() != null) {
-            healthmonitorsBuilder.setId(toUuid(healthMonitor.getLoadBalancerHealthMonitorID()));
+            healthmonitorsBuilder.setUuid(toUuid(healthMonitor.getLoadBalancerHealthMonitorID()));
         } else {
             logger.warn("Attempting to write neutron laod balancer health monitor without UUID");
         }