TSC-115: Fix MinimumBandwidthRule direction

[neutron.git] / transcriber / src / main / java / org / opendaylight / neutron / transcriber / NeutronMeteringLabelRuleInterface.java

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
index aeec19ab6550ef60f3fe32763d73af116cf361b3..d9affc2d2657d963a8b2b93e7c51a41e89d38e55 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
@@ -5,37 +5,31 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.neutron.transcriber;
 
-import com.google.common.collect.ImmutableBiMap;
 import java.util.List;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronMeteringLabelRuleCRUD;
 import org.opendaylight.neutron.spi.NeutronMeteringLabelRule;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.DirectionBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.DirectionEgress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.DirectionIngress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.NeutronUtils.DirectionMapper;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.rules.attributes.MeteringRules;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.rules.attributes.metering.rules.MeteringRule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.rules.attributes.metering.rules.MeteringRuleBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.metering.rev150712.metering.rules.attributes.metering.rules.MeteringRuleKey;
+import org.ops4j.pax.cdi.api.OsgiServiceProvider;
 
+@Singleton
+@OsgiServiceProvider(classes = INeutronMeteringLabelRuleCRUD.class)
 public final class NeutronMeteringLabelRuleInterface
-        extends AbstractNeutronInterface<MeteringRule, MeteringRules, NeutronMeteringLabelRule>
+        extends AbstractNeutronInterface<MeteringRule, MeteringRules, MeteringRuleKey, NeutronMeteringLabelRule>
         implements INeutronMeteringLabelRuleCRUD {
-    private static final Logger LOGGER = LoggerFactory.getLogger(NeutronMeteringLabelRuleInterface.class);
-
-    private static final ImmutableBiMap<Class<? extends DirectionBase>,
-            String> DIRECTION_MAP = new ImmutableBiMap.Builder<Class<? extends DirectionBase>, String>()
-                    .put(DirectionEgress.class, "egress").put(DirectionIngress.class, "ingress").build();
 
-    NeutronMeteringLabelRuleInterface(DataBroker db) {
-        super(db);
+    @Inject
+    public NeutronMeteringLabelRuleInterface(DataBroker db) {
+        super(MeteringRuleBuilder.class, db);
     }
 
     // IfNBMeteringLabelRuleCRUD methods
@@ -44,37 +38,20 @@ public final class NeutronMeteringLabelRuleInterface
         return rules.getMeteringRule();
     }
 
-    @Override
-    protected InstanceIdentifier<MeteringRule> createInstanceIdentifier(MeteringRule item) {
-        return InstanceIdentifier.create(Neutron.class).child(MeteringRules.class).child(MeteringRule.class,
-                item.getKey());
-    }
-
-    @Override
-    protected InstanceIdentifier<MeteringRules> createInstanceIdentifier() {
-        return InstanceIdentifier.create(Neutron.class).child(MeteringRules.class);
-    }
-
     @Override
     protected MeteringRule toMd(NeutronMeteringLabelRule meteringLabelRule) {
         final MeteringRuleBuilder meteringRuleBuilder = new MeteringRuleBuilder();
-        if (meteringLabelRule.getID() != null) {
-            meteringRuleBuilder.setUuid(toUuid(meteringLabelRule.getID()));
-        }
-        if (meteringLabelRule.getTenantID() != null) {
-            meteringRuleBuilder.setTenantId(toUuid(meteringLabelRule.getTenantID()));
-        }
+        toMdIds(meteringLabelRule, meteringRuleBuilder);
         if (meteringLabelRule.getMeteringLabelRuleLabelID() != null) {
             meteringRuleBuilder.setMeteringLabelId(toUuid(meteringLabelRule.getMeteringLabelRuleLabelID()));
         }
         if (meteringLabelRule.getMeteringLabelRuleDirection() != null) {
-            final ImmutableBiMap<String, Class<? extends DirectionBase>> mapper = DIRECTION_MAP.inverse();
             meteringRuleBuilder.setDirection(
-                    (Class<? extends DirectionBase>) mapper.get(meteringLabelRule.getMeteringLabelRuleDirection()));
+                    DirectionMapper.get(meteringLabelRule.getMeteringLabelRuleDirection()));
         }
-        if (meteringLabelRule.getMeteringLabelRuleRemoteIPPrefix() != null) {
+        if (meteringLabelRule.getMeteringLabelRuleRemoteIpPrefix() != null) {
             final IpPrefix ipPrefix = new IpPrefix(
-                    meteringLabelRule.getMeteringLabelRuleRemoteIPPrefix().toCharArray());
+                    meteringLabelRule.getMeteringLabelRuleRemoteIpPrefix().toCharArray());
             meteringRuleBuilder.setRemoteIpPrefix(ipPrefix);
         }
         meteringRuleBuilder.setExcluded(meteringLabelRule.getMeteringLabelRuleExcluded());
@@ -82,28 +59,17 @@ public final class NeutronMeteringLabelRuleInterface
     }
 
     @Override
-    protected MeteringRule toMd(String uuid) {
-        final MeteringRuleBuilder meteringRuleBuilder = new MeteringRuleBuilder();
-        meteringRuleBuilder.setUuid(toUuid(uuid));
-        return meteringRuleBuilder.build();
-    }
-
     protected NeutronMeteringLabelRule fromMd(MeteringRule rule) {
         final NeutronMeteringLabelRule answer = new NeutronMeteringLabelRule();
-        if (rule.getUuid() != null) {
-            answer.setID(rule.getUuid().getValue());
-        }
-        if (rule.getTenantId() != null) {
-            answer.setTenantID(rule.getTenantId());
-        }
+        fromMdIds(rule, answer);
         if (rule.getMeteringLabelId() != null) {
             answer.setMeteringLabelRuleLabelID(rule.getMeteringLabelId().getValue());
         }
         if (rule.getDirection() != null) {
-            answer.setMeteringLabelRuleDirection(DIRECTION_MAP.get(rule.getDirection()));
+            answer.setMeteringLabelRuleDirection(DirectionMapper.getDirectionString(rule.getDirection()));
         }
         if (rule.getRemoteIpPrefix() != null) {
-            answer.setMeteringLabelRuleRemoteIPPrefix(new String(rule.getRemoteIpPrefix().getValue()));
+            answer.setMeteringLabelRuleRemoteIpPrefix(new String(rule.getRemoteIpPrefix().getValue()));
         }
         answer.setMeteringLabelRuleExcluded(rule.isExcluded());
         return answer;