Bug 3254 - filling out names for EPGs

Router and Any group haven't had name parameter filled out.

Change-Id: I09f056ef64b6cd6529f742ecc01e2eb5d575dc53
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAware.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAware.java
index a84e7423fd6eeeb1ac68eaff4e69478a60e02e8d..cd49fe7b4a89bf193304548cede1251b5854f98e 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAware.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronNetworkAware.java
@@ -137,7 +137,9 @@ public class NeutronNetworkAware implements INeutronNetworkAware {
         Optional<EndpointGroup> potentialEpgExternal = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
                 IidFactory.endpointGroupIid(tenantId, MappingUtils.EPG_EXTERNAL_ID), rwTx);
         if (!potentialEpgExternal.isPresent()) {
-            EndpointGroup epgExternal = new EndpointGroupBuilder().setId(MappingUtils.EPG_EXTERNAL_ID)
+            EndpointGroup epgExternal = new EndpointGroupBuilder()
+                .setId(MappingUtils.EPG_EXTERNAL_ID)
+                .setName(new Name("EXTERNAL_group"))
                 .setDescription(new Description(MappingUtils.NEUTRON_EXTERNAL__ + "epg_external_networks"))
                 .setIntraGroupPolicy(IntraGroupPolicy.RequireContract)
                 .build();
@@ -151,7 +153,8 @@ public class NeutronNetworkAware implements INeutronNetworkAware {
         Optional<EndpointGroup> potentialDhcpEpg = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
                 epgDhcpIid, rwTx);
         if (!potentialDhcpEpg.isPresent()) {
-            EndpointGroup epgDhcp = new EndpointGroupBuilder().setId(MappingUtils.EPG_DHCP_ID)
+            EndpointGroup epgDhcp = new EndpointGroupBuilder()
+                .setId(MappingUtils.EPG_DHCP_ID)
                 .setName(new Name("DHCP_group"))
                 .setDescription(new Description("Group where are all DHCP endpoints."))
                 .setIntraGroupPolicy(IntraGroupPolicy.RequireContract)
@@ -164,7 +167,9 @@ public class NeutronNetworkAware implements INeutronNetworkAware {
         Optional<EndpointGroup> potentialEpgRouter = DataStoreHelper.readFromDs(LogicalDatastoreType.CONFIGURATION,
                 IidFactory.endpointGroupIid(tenantId, MappingUtils.EPG_ROUTER_ID), rwTx);
         if (!potentialEpgRouter.isPresent()) {
-            EndpointGroup epgRouter = new EndpointGroupBuilder().setId(MappingUtils.EPG_ROUTER_ID)
+            EndpointGroup epgRouter = new EndpointGroupBuilder()
+                .setId(MappingUtils.EPG_ROUTER_ID)
+                .setName(new Name("ROUTER_group"))
                 .setDescription(new Description(MappingUtils.NEUTRON_ROUTER__ + "epg_routers"))
                 .setIntraGroupPolicy(IntraGroupPolicy.RequireContract)
                 .build();

diff --git a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSecurityRuleAware.java b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSecurityRuleAware.java
index f39c1bf7339e5747dd4e746eead4298aba1dc32b..21992975b2bf31e356d06d4aade14e4dbe5e5db8 100644 (file)
--- a/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSecurityRuleAware.java
+++ b/neutron-mapper/src/main/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/NeutronSecurityRuleAware.java
@@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.ContractId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.Description;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.EndpointGroupId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.Name;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.RuleName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.SelectorName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.SubjectName;
@@ -182,7 +183,9 @@ public class NeutronSecurityRuleAware implements INeutronSecurityRuleAware {
     }
 
     private static EndpointGroup createEpgAny() {
-        return new EndpointGroupBuilder().setId(MappingUtils.EPG_ANY_ID)
+        return new EndpointGroupBuilder()
+                .setId(MappingUtils.EPG_ANY_ID)
+                .setName(new Name("ANY_group"))
                 .setDescription(new Description(MappingUtils.NEUTRON_RULE__ + "epg_any"))
                 .setIntraGroupPolicy(IntraGroupPolicy.RequireContract)
                 .build();