Fix SecGrp and SecGrpRule.

I can now get SecGrp and SecGrpRules from:
https://review.openstack.org/#/c/178325/

Change-Id: Ieaf9aefda432908f8af38c180d6eb31a1eea15e0
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
(cherry picked from commit 3e3b80adc65d712daa6811beaf72eb6dad893694)

diff --git a/model/src/main/yang/neutron-secgroups.yang b/model/src/main/yang/neutron-secgroups.yang
index 755f026d68e62bb2b8c6f649f563df64727458bd..1b4f12cb1d6e1734725e9c3b03021a4d6a6d9c2a 100644 (file)
--- a/model/src/main/yang/neutron-secgroups.yang
+++ b/model/src/main/yang/neutron-secgroups.yang
@@ -126,6 +126,7 @@ module neutron-secgroups {
         container security-groups {
             description "Container for security groups.";
             list security-group {
+                key "uuid";
                 uses attrs:base-attrs;
                 uses security-group-attrs;
                 description "List of Metering Labels.";
@@ -140,6 +141,7 @@ module neutron-secgroups {
         container security-rules {
             description "Container for security group rules.";
             list security-rule {
+                key "id";
                 uses security-rule-attrs;
                 description "List of Security Group Rules.";
             }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
index 1b6eef7c1f7c451b176c5e56a7bf942f3075731a..34521cf0fe15fc0c290880a5cd76095de029547e 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
@@ -27,6 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.SecurityGroups;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroup;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev141002.security.groups.attributes.security.groups.SecurityGroupKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -165,7 +166,8 @@ public class NeutronSecurityGroupInterface extends AbstractNeutronInterface<Secu
 
     @Override
     protected InstanceIdentifier<SecurityGroup> createInstanceIdentifier(SecurityGroup securityGroup) {
-        return InstanceIdentifier.create(Neutron.class).child(SecurityGroups.class).child(SecurityGroup.class);
+        return InstanceIdentifier.create(Neutron.class).child(SecurityGroups.class).child(SecurityGroup.class,
+                securityGroup.getKey());
     }
 
     @Override

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
index 241195fb2ee26044bdad70e1250b740b92c11acf..0aba1688bef3c1e3367f065c56ec760db3ccdd0b 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -204,7 +204,8 @@ public class NeutronSecurityRuleInterface extends AbstractNeutronInterface<Secur
 
     @Override
     protected InstanceIdentifier<SecurityRule> createInstanceIdentifier(SecurityRule securityRule) {
-        return InstanceIdentifier.create(Neutron.class).child(SecurityRules.class).child(SecurityRule.class);
+        return InstanceIdentifier.create(Neutron.class).child(SecurityRules.class).child(SecurityRule.class,
+                securityRule.getKey());
     }
 
     @Override