From 7b947b83f9839553cf877bf516f8103af6efc343 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 8 Dec 2015 09:07:26 +0100 Subject: [PATCH] Extract neutron-utils from mdsal-utils NeutronModelsDataStoreHelper adds a dependency on neutron, so it should really be in its own bundle. Change-Id: I051b304c77aeee9cbe5a1309bb2f512d87d7387a Signed-off-by: Stephen Kitt --- features/ovsdb/src/main/features/features.xml | 1 + openstack/net-virt/pom.xml | 5 ++ .../openstack/netvirt/ConfigActivator.java | 2 +- .../netvirt/impl/NeutronL3Adapter.java | 2 +- utils/mdsal-utils/pom.xml | 9 --- utils/neutron-utils/pom.xml | 59 +++++++++++++++++++ .../utils/NeutronModelsDataStoreHelper.java | 3 +- utils/pom.xml | 3 +- 8 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 utils/neutron-utils/pom.xml rename utils/{mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal => neutron-utils/src/main/java/org/opendaylight/ovsdb/utils/neutron}/utils/NeutronModelsDataStoreHelper.java (96%) diff --git a/features/ovsdb/src/main/features/features.xml b/features/ovsdb/src/main/features/features.xml index e36f3d1158..134076ffee 100644 --- a/features/ovsdb/src/main/features/features.xml +++ b/features/ovsdb/src/main/features/features.xml @@ -36,6 +36,7 @@ odl-openflowplugin-flow-services odl-openflowplugin-nxm-extensions mvn:org.opendaylight.ovsdb/utils.servicehelper/{{VERSION}} + mvn:org.opendaylight.ovsdb/utils.neutron-utils/{{VERSION}} mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}} mvn:org.opendaylight.ovsdb/openstack.net-virt/{{VERSION}} mvn:org.opendaylight.ovsdb/openstack.net-virt-providers/{{VERSION}} diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml index fdc004d35a..0e966003ca 100644 --- a/openstack/net-virt/pom.xml +++ b/openstack/net-virt/pom.xml @@ -125,6 +125,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html utils.mdsal-utils ${project.version} + + ${project.groupId} + utils.neutron-utils + ${project.version} + org.opendaylight.yangtools yang-common diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java index ee392fbea3..8a5915b244 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/ConfigActivator.java @@ -87,7 +87,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronRouter import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronSecurityGroupAware; import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronSecurityRuleAware; import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.INeutronSubnetAware; -import org.opendaylight.ovsdb.utils.mdsal.utils.NeutronModelsDataStoreHelper; +import org.opendaylight.ovsdb.utils.neutron.utils.NeutronModelsDataStoreHelper; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java index 8d379f416f..e5e05966e1 100644 --- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java +++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java @@ -50,7 +50,7 @@ import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronNetworkC import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronPortCRUD; import org.opendaylight.ovsdb.openstack.netvirt.translator.crud.INeutronSubnetCRUD; import org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.impl.NeutronIAwareUtil; -import org.opendaylight.ovsdb.utils.mdsal.utils.NeutronModelsDataStoreHelper; +import org.opendaylight.ovsdb.utils.neutron.utils.NeutronModelsDataStoreHelper; import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper; 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.yang.types.rev100924.MacAddress; diff --git a/utils/mdsal-utils/pom.xml b/utils/mdsal-utils/pom.xml index 11ddb71dd8..53e09a82ed 100644 --- a/utils/mdsal-utils/pom.xml +++ b/utils/mdsal-utils/pom.xml @@ -29,10 +29,6 @@ https://wiki.opendaylight.org/view/OVSDB_Integration:Main - - 0.6.0-SNAPSHOT - - com.google.guava @@ -62,11 +58,6 @@ mockito-all test - - org.opendaylight.neutron - model - ${neutron.model.version} - diff --git a/utils/neutron-utils/pom.xml b/utils/neutron-utils/pom.xml new file mode 100644 index 0000000000..e8749e892e --- /dev/null +++ b/utils/neutron-utils/pom.xml @@ -0,0 +1,59 @@ + + + + + 4.0.0 + + + org.opendaylight.mdsal + binding-parent + 0.8.0-SNAPSHOT + + + + org.opendaylight.ovsdb + utils.neutron-utils + 1.2.1-SNAPSHOT + bundle + + + + org.opendaylight.controller + sal-binding-api + 1.3.0-SNAPSHOT + + + org.slf4j + slf4j-api + + + ${project.groupId} + utils.mdsal-utils + ${project.version} + + + org.opendaylight.neutron + model + 0.6.0-SNAPSHOT + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + + + \ No newline at end of file diff --git a/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NeutronModelsDataStoreHelper.java b/utils/neutron-utils/src/main/java/org/opendaylight/ovsdb/utils/neutron/utils/NeutronModelsDataStoreHelper.java similarity index 96% rename from utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NeutronModelsDataStoreHelper.java rename to utils/neutron-utils/src/main/java/org/opendaylight/ovsdb/utils/neutron/utils/NeutronModelsDataStoreHelper.java index e22b7248c8..30bd0fbe34 100644 --- a/utils/mdsal-utils/src/main/java/org/opendaylight/ovsdb/utils/mdsal/utils/NeutronModelsDataStoreHelper.java +++ b/utils/neutron-utils/src/main/java/org/opendaylight/ovsdb/utils/neutron/utils/NeutronModelsDataStoreHelper.java @@ -5,10 +5,11 @@ * 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.ovsdb.utils.mdsal.utils; +package org.opendaylight.ovsdb.utils.neutron.utils; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils; 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.l3.rev150712.routers.attributes.Routers; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports; diff --git a/utils/pom.xml b/utils/pom.xml index f38b137141..a977379ddc 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -51,8 +51,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html config mdsal-node mdsal-openflow - servicehelper mdsal-utils + neutron-utils + servicehelper southbound-utils -- 2.36.6