Neutron-mapper uses only DTOs from neutron.yang

[groupbasedpolicy.git] / neutron-mapper / src / test / java / org / opendaylight / groupbasedpolicy / neutron / mapper / test / NeutronEntityFactory.java

diff --git a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronEntityFactory.java b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronEntityFactory.java
index fc0f7356f62dd46bba795dc59cd8f68f69324b1e..b4f3392b6a9e8b47183f0a5e98eb8adbc6d9e383 100644 (file)
--- a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronEntityFactory.java
+++ b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/NeutronEntityFactory.java
@@ -1,10 +1,15 @@
 package org.opendaylight.groupbasedpolicy.neutron.mapper.test;
 
-import java.util.ArrayList;
-import java.util.List;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.DirectionBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.EthertypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRuleBuilder;
 
-import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.neutron.spi.NeutronSecurityRule;
+import com.google.common.base.Strings;
 
 public final class NeutronEntityFactory {
 
@@ -12,62 +17,38 @@ public final class NeutronEntityFactory {
         throw new UnsupportedOperationException("Cannot create an instance");
     }
 
-    public static NeutronSecurityGroup securityGroup(String id, String tenantId) {
-        NeutronSecurityGroup secGrp = new NeutronSecurityGroup();
-        secGrp.setSecurityGroupUUID(id);
-        secGrp.setSecurityGroupTenantID(tenantId);
-        secGrp.setSecurityRules(new ArrayList<NeutronSecurityRule>());
-        return secGrp;
+    public static SecurityGroup securityGroup(String id, String tenantId) {
+        return new SecurityGroupBuilder().setUuid(new Uuid(id)).setTenantId(new Uuid(tenantId)).build();
     }
 
-    public static NeutronSecurityGroup securityGroupWithName(String id, String tenantId, String name) {
-        NeutronSecurityGroup secGrp = new NeutronSecurityGroup();
-        secGrp.setSecurityGroupUUID(id);
-        secGrp.setSecurityGroupTenantID(tenantId);
-        secGrp.setSecurityGroupName(name);
-        return secGrp;
+    public static SecurityGroup securityGroupWithName(String id, String tenantId, String name) {
+        return new SecurityGroupBuilder().setUuid(new Uuid(id)).setTenantId(new Uuid(tenantId)).setName(name).build();
     }
 
-    public static NeutronSecurityGroup securityGroup(String id, String tenantId, List<NeutronSecurityRule> secRules) {
-        NeutronSecurityGroup secGrp = new NeutronSecurityGroup();
-        secGrp.setSecurityGroupUUID(id);
-        secGrp.setSecurityGroupTenantID(tenantId);
-        secGrp.setSecurityRules(secRules);
-        return secGrp;
+    public static SecurityRule securityRuleWithoutGroupIds(String id, String tenant, Class<? extends EthertypeBase> etherType,
+            Class<? extends DirectionBase> direction, Class<? extends ProtocolBase> protocol, int portMin, int portMax) {
+        SecurityRuleBuilder secRule = new SecurityRuleBuilder();
+        secRule.setId(new Uuid(id));
+        secRule.setTenantId(new Uuid(tenant));
+        secRule.setEthertype(etherType);
+        secRule.setDirection(direction);
+        secRule.setProtocol(protocol);
+        secRule.setPortRangeMin(portMin);
+        secRule.setPortRangeMax(portMax);
+        return secRule.build();
     }
 
-    public static NeutronSecurityRule securityRuleWithGroupIds(String id, String tenant, String ownerGroupId,
+    public static SecurityRule securityRuleWithEtherType(String id, String tenant,
+            Class<? extends EthertypeBase> etherType, Class<? extends DirectionBase> direction, String ownerGroupId,
             String remoteGroupId) {
-        NeutronSecurityRule secRule = new NeutronSecurityRule();
-        secRule.setSecurityRuleUUID(id);
-        secRule.setSecurityRuleTenantID(tenant);
-        secRule.setSecurityRuleGroupID(ownerGroupId);
-        secRule.setSecurityRemoteGroupID(remoteGroupId);
-        return secRule;
-    }
-
-    public static NeutronSecurityRule securityRuleWithoutGroupIds(String id, String tenant, String etherType,
-            String direction, String protocol, int portMin, int portMax) {
-        NeutronSecurityRule secRule = new NeutronSecurityRule();
-        secRule.setSecurityRuleUUID(id);
-        secRule.setSecurityRuleTenantID(tenant);
-        secRule.setSecurityRuleEthertype(etherType);
-        secRule.setSecurityRuleDirection(direction);
-        secRule.setSecurityRuleProtocol(protocol);
-        secRule.setSecurityRulePortMin(portMin);
-        secRule.setSecurityRulePortMax(portMax);
-        return secRule;
-    }
-
-    public static NeutronSecurityRule securityRuleWithEtherType(String id, String tenant, String etherType,
-            String direction, String ownerGroupId, String remoteGroupId) {
-        NeutronSecurityRule secRule = new NeutronSecurityRule();
-        secRule.setSecurityRuleUUID(id);
-        secRule.setSecurityRuleTenantID(tenant);
-        secRule.setSecurityRuleEthertype(etherType);
-        secRule.setSecurityRuleDirection(direction);
-        secRule.setSecurityRuleGroupID(ownerGroupId);
-        secRule.setSecurityRemoteGroupID(remoteGroupId);
-        return secRule;
+        SecurityRuleBuilder securityRuleBuilder = new SecurityRuleBuilder().setId(new Uuid(id))
+            .setTenantId(new Uuid(tenant))
+            .setEthertype(etherType)
+            .setDirection(direction)
+            .setSecurityGroupId(new Uuid(ownerGroupId));
+        if (!Strings.isNullOrEmpty(remoteGroupId)) {
+            securityRuleBuilder.setRemoteGroupId(new Uuid(remoteGroupId));
+        }
+        return securityRuleBuilder.build();
     }
 }