From: adetalhouet Date: Fri, 30 Oct 2015 16:10:43 +0000 (-0400) Subject: Use constants defined in southbound-impl X-Git-Tag: release/beryllium~56 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a957878b92c237564b72b6a2c6d549974ba2720f;p=unimgr.git Use constants defined in southbound-impl Instead of bringing those constants locally, use the already defined ones from the ovsdb southbound piece Change-Id: I1a5dd0eeef0493dd2a6250cde30a6f06c2b82057 Signed-off-by: adetalhouet --- diff --git a/impl/pom.xml b/impl/pom.xml index af54334c..00bf8e65 100755 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -31,10 +31,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL unimgr-api ${project.version} + org.opendaylight.ovsdb - southbound-api + southbound-impl ${ovsdb.version} diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java index 21a0d484..0f39295e 100644 --- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java @@ -9,33 +9,8 @@ package org.opendaylight.unimgr.impl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeBase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeDpdk; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeDpdkr; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeDpdkvhost; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeDpdkvhostuser; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeGeneve; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeGre; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeGre64; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeInternal; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeIpsecGre; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeIpsecGre64; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeLisp; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypePatch; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeSystem; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeTap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolBase; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow10; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow11; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow12; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow13; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow14; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeProtocolOpenflow15; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; -import com.google.common.collect.ImmutableBiMap; - public class UnimgrConstants { public static final TopologyId OVSDB_TOPOLOGY_ID = new TopologyId(new Uri("ovsdb:1")); @@ -63,31 +38,4 @@ public class UnimgrConstants { public static final String DEFAULT_TUNNEL_IFACE = "eth1"; public static final String DEFAULT_GRE_NAME = "gre"; - - public static final ImmutableBiMap> OVSDB_INTERFACE_TYPE_MAP - = new ImmutableBiMap.Builder>() - .put("internal", InterfaceTypeInternal.class) - .put("vxlan", InterfaceTypeVxlan.class) - .put("patch", InterfaceTypePatch.class) - .put("system", InterfaceTypeSystem.class) - .put("tap", InterfaceTypeTap.class) - .put("geneve", InterfaceTypeGeneve.class) - .put("gre", InterfaceTypeGre.class) - .put("ipsec_gre", InterfaceTypeIpsecGre.class) - .put("gre64", InterfaceTypeGre64.class) - .put("ipsec_gre64", InterfaceTypeIpsecGre64.class) - .put("lisp", InterfaceTypeLisp.class) - .put("dpdk", InterfaceTypeDpdk.class) - .put("dpdkr", InterfaceTypeDpdkr.class) - .put("dpdkvhost", InterfaceTypeDpdkvhost.class) - .put("dpdkvhostuser", InterfaceTypeDpdkvhostuser.class).build(); - - public static final ImmutableBiMap, String> OVSDB_PROTOCOL_MAP - = new ImmutableBiMap.Builder, String>() - .put(OvsdbBridgeProtocolOpenflow10.class, "OpenFlow10") - .put(OvsdbBridgeProtocolOpenflow11.class, "OpenFlow11") - .put(OvsdbBridgeProtocolOpenflow12.class, "OpenFlow12") - .put(OvsdbBridgeProtocolOpenflow13.class, "OpenFlow13") - .put(OvsdbBridgeProtocolOpenflow14.class, "OpenFlow14") - .put(OvsdbBridgeProtocolOpenflow15.class, "OpenFlow15").build(); } diff --git a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java index 741e4af5..cbe35ef5 100644 --- a/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java @@ -26,6 +26,7 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.ovsdb.southbound.SouthboundConstants; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber; @@ -190,7 +191,7 @@ public class UnimgrUtils { public static List createMdsalProtocols() { List protocolList = new ArrayList(); ImmutableBiMap> mapper = - UnimgrConstants.OVSDB_PROTOCOL_MAP.inverse(); + SouthboundConstants.OVSDB_PROTOCOL_MAP.inverse(); protocolList.add(new ProtocolEntryBuilder(). setProtocol((Class) mapper.get("OpenFlow13")).build()); return protocolList; @@ -392,7 +393,7 @@ public class UnimgrUtils { new OvsdbTerminationPointAugmentationBuilder(); tpAugmentationBuilder.setName(portName); if (type != null) { - tpAugmentationBuilder.setInterfaceType(UnimgrConstants.OVSDB_INTERFACE_TYPE_MAP.get(type)); + tpAugmentationBuilder.setInterfaceType(SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.get(type)); } TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); @@ -418,7 +419,7 @@ public class UnimgrUtils { .build(); options.add(destinationIp); tpAugmentationBuilder.setOptions(options); - tpAugmentationBuilder.setInterfaceType(UnimgrConstants.OVSDB_INTERFACE_TYPE_MAP.get("gre")); + tpAugmentationBuilder.setInterfaceType(SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.get("gre")); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());