translator: remove dependency of neutron.spi

netvirt still had a dependency on netutron.spi. which seems accidentally
remained when netvirt migrated from I*Aware AD-SAL to MD-SAL.
This patch removes its dependency and finish its migration with the only
dependency is neutron yang model.
In order to avoid circular dependency, NeutronModelsDataStoreHelper was
moved from neutron.util to net-virt.

Change-Id: I09628c39a2df85bc18d930639965d5a466134658
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/features/pom.xml b/features/pom.xml
index bd7f66554c38a554f32bf5212949c4dbb4f7f7eb..89d050a7aa243dc94f91f45411d3e1d6ad604595 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -269,6 +269,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>openstack.net-virt</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>utils.netvirt-it-utils</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 752f8e6ded03962fb650a011584c59f29a86066a..c562b9cb6298cec2aa602617afcf55195f361140 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -87,6 +87,7 @@
     <feature version="${ovsdb.version}">odl-ovsdb-southbound-api</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
+    <bundle>mvn:org.opendaylight.netvirt/openstack.net-virt/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/utils.servicehelper/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/utils.neutron-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.netvirt/utils.mdsal-utils/{{VERSION}}</bundle>

diff --git a/netvirt/it/pom.xml b/netvirt/it/pom.xml
index 7ad9fa3051289d3c76fb201518e98d1286c0c0ac..a7768cdcf088e2ad111800704e6263c3b0d016ec 100644 (file)
--- a/netvirt/it/pom.xml
+++ b/netvirt/it/pom.xml
@@ -82,6 +82,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>openstack.net-virt</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>utils.mdsal-utils</artifactId>

diff --git a/netvirt/it/src/test/java/org/opendaylight/netvirt/netvirt/it/NetvirtIT.java b/netvirt/it/src/test/java/org/opendaylight/netvirt/netvirt/it/NetvirtIT.java
index d3e23c7bee76ab4dcea65bfac0973899ae2a9639..785dd4fbe9d92b9919c7a66ee24e81ef41f5588a 100644 (file)
--- a/netvirt/it/src/test/java/org/opendaylight/netvirt/netvirt/it/NetvirtIT.java
+++ b/netvirt/it/src/test/java/org/opendaylight/netvirt/netvirt/it/NetvirtIT.java
@@ -35,10 +35,10 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.mdsal.it.base.AbstractMdsalTestBase;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.netvirt.openstack.netvirt.NeutronModelsDataStoreHelper;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.NeutronNetwork;
 import org.opendaylight.netvirt.utils.netvirt.it.utils.ItConstants;
 import org.opendaylight.netvirt.utils.netvirt.it.utils.NetvirtItUtils;
-import org.opendaylight.netvirt.utils.neutron.utils.NeutronModelsDataStoreHelper;
 import org.opendaylight.netvirt.utils.neutron.utils.NeutronUtils;
 import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
 import org.opendaylight.ovsdb.utils.mdsal.utils.NotifyingDataChangeListener;

diff --git a/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java b/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java
index a65a008298aeb856edfa03abe53a40677a01d1b7..7dda22d7b4fcf34baae4172701be14be8080baee 100644 (file)
--- a/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java
+++ b/openstack/net-virt-it/src/test/java/org/opendaylight/netvirt/openstack/netvirt/it/NetvirtIT.java
@@ -46,20 +46,20 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.netvirt.utils.netvirt.it.utils.NetvirtItUtils;
 import org.opendaylight.netvirt.utils.netvirt.it.utils.NeutronNetItUtil;
 import org.opendaylight.netvirt.utils.neutron.utils.NeutronUtils;
-import org.opendaylight.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
-import org.opendaylight.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.neutron.spi.NeutronSecurityRule;
-import org.opendaylight.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.opendaylight.ovsdb.lib.notation.Version;
 import org.opendaylight.netvirt.openstack.netvirt.NetworkHandler;
 import org.opendaylight.netvirt.openstack.netvirt.api.Southbound;
 import org.opendaylight.netvirt.openstack.netvirt.providers.NetvirtProvidersProvider;
 import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.PipelineOrchestrator;
 import org.opendaylight.netvirt.openstack.netvirt.providers.openflow13.Service;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityRule;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnet;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD;
 import org.opendaylight.ovsdb.utils.ovsdb.it.utils.DockerOvs;
 import org.opendaylight.ovsdb.utils.ovsdb.it.utils.ItConstants;
 import org.opendaylight.ovsdb.utils.ovsdb.it.utils.OvsdbItUtils;
@@ -537,7 +537,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         NeutronSecurityGroup neutronSG = new NeutronSecurityGroup();
         neutronSG.setSecurityGroupName("DefaultSG");
         neutronSG.setID("d3329053-bae5-4bf4-a2d1-7330f11ba5db");
-        neutronSG.setTenantID(tenantId);
+        neutronSG.setSecurityGroupTenantID(tenantId);
 
         List<NeutronSecurityRule> nsrs = new ArrayList<>();
         NeutronSecurityRule nsrIN = new NeutronSecurityRule();
@@ -548,7 +548,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         nsrIN.setSecurityRuleProtocol("TCP");
         nsrIN.setSecurityRuleRemoteIpPrefix("10.0.0.0/24");
         nsrIN.setID("823faaf7-175d-4f01-a271-0bf56fb1e7e6");
-        nsrIN.setTenantID(tenantId);
+        nsrIN.setSecurityRuleTenantID(tenantId);
 
         NeutronSecurityRule nsrEG = new NeutronSecurityRule();
         nsrEG.setSecurityRemoteGroupID(null);
@@ -558,14 +558,14 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         nsrEG.setSecurityRuleProtocol("TCP");
         nsrEG.setSecurityRuleRemoteIpPrefix("10.0.0.0/24");
         nsrEG.setID("823faaf7-175d-4f01-a271-0bf56fb1e7e1");
-        nsrEG.setTenantID(tenantId);
+        nsrEG.setSecurityRuleTenantID(tenantId);
 
         nsrs.add(nsrIN);
         nsrs.add(nsrEG);
 
         ineutronSecurityRuleCRUD.addNeutronSecurityRule(nsrIN);
         ineutronSecurityRuleCRUD.addNeutronSecurityRule(nsrEG);
-        ineutronSecurityGroupCRUD.add(neutronSG);
+        ineutronSecurityGroupCRUD.addNeutronSecurityGroup(neutronSG);
 
         List<NeutronSecurityGroup> sgs = new ArrayList<>();
         sgs.add(neutronSG);
@@ -573,7 +573,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
 
         INeutronPortCRUD iNeutronPortCRUD =
                 (INeutronPortCRUD) ServiceHelper.getGlobalInstance(INeutronPortCRUD.class, this);
-        iNeutronPortCRUD.update(portId, nport);
+        iNeutronPortCRUD.updatePort(portId, nport);
 
         LOG.info("Neutron ports have been added");
         Thread.sleep(10000);
@@ -583,7 +583,7 @@ public class NetvirtIT extends AbstractMdsalTestBase {
         flowId = "Ingress_IP" + nn.getProviderSegmentationID() + "_" + nport.getMacAddress() + "_Permit_";
         nvItUtils.verifyFlow(datapathId, flowId, pipelineOrchestrator.getTable(Service.INGRESS_ACL));
 
-        ineutronSecurityGroupCRUD.remove(neutronSG.getID());
+        ineutronSecurityGroupCRUD.removeNeutronSecurityGroup(neutronSG.getID());
         ineutronSecurityRuleCRUD.removeNeutronSecurityRule(nsrEG.getID());
         ineutronSecurityRuleCRUD.removeNeutronSecurityRule(nsrIN.getID());
     }

diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml
index d9575ad5e9761cc9941f6b4d6ab4c3fc0b8e6d8e..580de13e5219cbd12a0d674f343b330151cfca9a 100644 (file)
--- a/openstack/net-virt/pom.xml
+++ b/openstack/net-virt/pom.xml
@@ -70,11 +70,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>utils.mdsal-utils</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>utils.neutron-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>model</artifactId>

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java
index 96706ac888bd2db1019e1422ea93dfdb3dbd0f86..0f8470083633a646807e9c83c87c4f450a0a734b 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/ConfigActivator.java
@@ -19,11 +19,13 @@ import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderCo
 import org.opendaylight.netvirt.openstack.netvirt.api.ArpProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.BridgeConfigurationManager;
 import org.opendaylight.netvirt.openstack.netvirt.api.ConfigurationService;
+import org.opendaylight.netvirt.openstack.netvirt.api.Constants;
 import org.opendaylight.netvirt.openstack.netvirt.api.EgressAclProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.EventDispatcher;
 import org.opendaylight.netvirt.openstack.netvirt.api.GatewayMacResolver;
 import org.opendaylight.netvirt.openstack.netvirt.api.GatewayMacResolverListener;
 import org.opendaylight.netvirt.openstack.netvirt.api.IcmpEchoProvider;
+import org.opendaylight.netvirt.openstack.netvirt.api.InboundNatProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.IngressAclProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.L3ForwardingProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.LoadBalancerProvider;
@@ -35,13 +37,17 @@ import org.opendaylight.netvirt.openstack.netvirt.api.OutboundNatProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.OvsdbInventoryListener;
 import org.opendaylight.netvirt.openstack.netvirt.api.OvsdbInventoryService;
 import org.opendaylight.netvirt.openstack.netvirt.api.RoutingProvider;
+import org.opendaylight.netvirt.openstack.netvirt.api.SecurityGroupCacheManger;
 import org.opendaylight.netvirt.openstack.netvirt.api.SecurityServicesManager;
+import org.opendaylight.netvirt.openstack.netvirt.api.Southbound;
 import org.opendaylight.netvirt.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.netvirt.openstack.netvirt.api.VlanConfigurationCache;
 import org.opendaylight.netvirt.openstack.netvirt.impl.BridgeConfigurationManagerImpl;
 import org.opendaylight.netvirt.openstack.netvirt.impl.ConfigurationServiceImpl;
 import org.opendaylight.netvirt.openstack.netvirt.impl.DistributedArpService;
 import org.opendaylight.netvirt.openstack.netvirt.impl.EventDispatcherImpl;
+import org.opendaylight.netvirt.openstack.netvirt.impl.HostConfigService;
+import org.opendaylight.netvirt.openstack.netvirt.impl.NeutronL3Adapter;
 import org.opendaylight.netvirt.openstack.netvirt.impl.NodeCacheManagerImpl;
 import org.opendaylight.netvirt.openstack.netvirt.impl.OpenstackRouter;
 import org.opendaylight.netvirt.openstack.netvirt.impl.OvsdbInventoryServiceImpl;
@@ -49,16 +55,19 @@ import org.opendaylight.netvirt.openstack.netvirt.impl.ProviderNetworkManagerImp
 import org.opendaylight.netvirt.openstack.netvirt.impl.SecurityGroupCacheManagerImpl;
 import org.opendaylight.netvirt.openstack.netvirt.impl.SecurityServicesImpl;
 import org.opendaylight.netvirt.openstack.netvirt.impl.SouthboundImpl;
-import org.opendaylight.netvirt.openstack.netvirt.impl.HostConfigService;
+import org.opendaylight.netvirt.openstack.netvirt.impl.TenantNetworkManagerImpl;
 import org.opendaylight.netvirt.openstack.netvirt.impl.VlanConfigurationCacheImpl;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronFloatingIPCRUD;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerCRUD;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronLoadBalancerPoolCRUD;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronFirewallInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronFirewallPolicyInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronFirewallRuleInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronFloatingIPInterface;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronLoadBalancerHealthMonitorInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronLoadBalancerInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronLoadBalancerListenerInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronLoadBalancerPoolInterface;
@@ -70,28 +79,18 @@ import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronSe
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronSecurityRuleInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronSubnetInterface;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronFirewallAware;
+import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronFirewallRuleAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronFirewallPolicyAware;
+import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronFloatingIPAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronLoadBalancerAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronLoadBalancerPoolAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronLoadBalancerPoolMemberAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronNetworkAware;
+import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronPortAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronRouterAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronSecurityGroupAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronSecurityRuleAware;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronSubnetAware;
-import org.opendaylight.netvirt.openstack.netvirt.api.Constants;
-import org.opendaylight.netvirt.openstack.netvirt.api.InboundNatProvider;
-import org.opendaylight.netvirt.openstack.netvirt.api.SecurityGroupCacheManger;
-import org.opendaylight.netvirt.openstack.netvirt.api.Southbound;
-import org.opendaylight.netvirt.openstack.netvirt.impl.NeutronL3Adapter;
-import org.opendaylight.netvirt.openstack.netvirt.impl.TenantNetworkManagerImpl;
-import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronFloatingIPCRUD;
-import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
-import org.opendaylight.netvirt.openstack.netvirt.translator.crud.impl.NeutronLoadBalancerHealthMonitorInterface;
-import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronFirewallRuleAware;
-import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronFloatingIPAware;
-import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.INeutronPortAware;
-import org.opendaylight.netvirt.utils.neutron.utils.NeutronModelsDataStoreHelper;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;

diff --git a/utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronModelsDataStoreHelper.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NeutronModelsDataStoreHelper.java
similarity index 98%
rename from utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronModelsDataStoreHelper.java
rename to openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NeutronModelsDataStoreHelper.java
index fa78525ac3cf9e0f36350a40796b33426f5156d0..a4fda550eca52d78ec4c54a6ce0b9e7eba8315bd 100644 (file)
--- a/utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronModelsDataStoreHelper.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/NeutronModelsDataStoreHelper.java
@@ -5,7 +5,7 @@
  * 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.netvirt.utils.neutron.utils;
+package org.opendaylight.netvirt.openstack.netvirt;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NeutronL3Adapter.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NeutronL3Adapter.java
index 990dc709e30a8e82519ad76189794d978ead0e6f..cbea9fa152b061bcf5c83702dcad3da99d44dd91 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NeutronL3Adapter.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/NeutronL3Adapter.java
@@ -19,6 +19,7 @@ import org.opendaylight.netvirt.openstack.netvirt.AbstractEvent;
 import org.opendaylight.netvirt.openstack.netvirt.AbstractHandler;
 import org.opendaylight.netvirt.openstack.netvirt.ConfigInterface;
 import org.opendaylight.netvirt.openstack.netvirt.NeutronL3AdapterEvent;
+import org.opendaylight.netvirt.openstack.netvirt.NeutronModelsDataStoreHelper;
 import org.opendaylight.netvirt.openstack.netvirt.api.Action;
 import org.opendaylight.netvirt.openstack.netvirt.api.ArpProvider;
 import org.opendaylight.netvirt.openstack.netvirt.api.ConfigurationService;
@@ -50,7 +51,6 @@ import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort;
 import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnet;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
 import org.opendaylight.netvirt.openstack.netvirt.translator.iaware.impl.NeutronIAwareUtil;
-import org.opendaylight.netvirt.utils.neutron.utils.NeutronModelsDataStoreHelper;
 import org.opendaylight.netvirt.utils.servicehelper.ServiceHelper;
 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;

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
index cfebe8b5805ebf64fbd8e7abeabb8c1b14448405..06b610f3987edd5819402373323112171270646b 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/netvirt/openstack/netvirt/impl/SecurityGroupCacheManagerImpl.java
@@ -17,7 +17,6 @@ import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGrou
 import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityRule;
 import org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs;
 import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD;
-import org.opendaylight.netvirt.utils.neutron.utils.NeutronUtils;
 import org.opendaylight.netvirt.utils.servicehelper.ServiceHelper;
 import org.osgi.framework.ServiceReference;
 import org.slf4j.Logger;

diff --git a/utils/netvirt-it-utils/pom.xml b/utils/netvirt-it-utils/pom.xml
index 38009b356436d10aaa6a33a73c26ee0e50be7711..7f478611c4623bebb5a607e7c24ed339313d4936 100644 (file)
--- a/utils/netvirt-it-utils/pom.xml
+++ b/utils/netvirt-it-utils/pom.xml
@@ -44,6 +44,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <artifactId>utils.mdsal-utils</artifactId>
           <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>openstack.net-virt</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
           <groupId>${project.groupId}</groupId>
           <artifactId>utils.neutron-utils</artifactId>

diff --git a/utils/netvirt-it-utils/src/main/java/org/opendaylight/netvirt/utils/netvirt/it/utils/NeutronNetItUtil.java b/utils/netvirt-it-utils/src/main/java/org/opendaylight/netvirt/utils/netvirt/it/utils/NeutronNetItUtil.java
index 0bd45cba4de468b4db44e7bdc7edfb051a829bec..0d2d5475fde4ad31466b007a523e3acdd4ab84a1 100644 (file)
--- a/utils/netvirt-it-utils/src/main/java/org/opendaylight/netvirt/utils/netvirt/it/utils/NeutronNetItUtil.java
+++ b/utils/netvirt-it-utils/src/main/java/org/opendaylight/netvirt/utils/netvirt/it/utils/NeutronNetItUtil.java
@@ -14,11 +14,11 @@ import java.util.Vector;
 
 import com.google.common.collect.Maps;
 import org.junit.Assert;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnet;
 import org.opendaylight.netvirt.utils.neutron.utils.NeutronUtils;
-import org.opendaylight.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 

diff --git a/utils/neutron-utils/pom.xml b/utils/neutron-utils/pom.xml
index 925f99766d1532e4bdcd017950110feb7aa33b6b..f69b5de5137c3d1c9e5ebd4f82ee4888b6f707b7 100644 (file)
--- a/utils/neutron-utils/pom.xml
+++ b/utils/neutron-utils/pom.xml
@@ -40,17 +40,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>utils.servicehelper</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>openstack.net-virt</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     <!-- neutron dependencies -->
         <dependency>
             <groupId>org.opendaylight.neutron</groupId>
             <artifactId>model</artifactId>
             <version>0.7.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.neutron</groupId>
-            <artifactId>neutron-spi</artifactId>
-            <version>${neutron.version}</version>
-        </dependency>
     </dependencies>
 
     <!--

diff --git a/utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronUtils.java b/utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronUtils.java
index f62a06a740e784b689a69ad4f31fa3eb3359e817..f65483921ec4a6fbca345596d54c55994e576bcf 100644 (file)
--- a/utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronUtils.java
+++ b/utils/neutron-utils/src/main/java/org/opendaylight/netvirt/utils/neutron/utils/NeutronUtils.java
@@ -13,16 +13,16 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
-import org.opendaylight.neutron.spi.INeutronPortCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD;
-import org.opendaylight.neutron.spi.INeutronSecurityRuleCRUD;
-import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.neutron.spi.NeutronNetwork;
-import org.opendaylight.neutron.spi.NeutronPort;
-import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.neutron.spi.NeutronSecurityRule;
-import org.opendaylight.neutron.spi.NeutronSubnet;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronNetwork;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronPort;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityGroup;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSecurityRule;
+import org.opendaylight.netvirt.openstack.netvirt.translator.NeutronSubnet;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronNetworkCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronPortCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityGroupCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSecurityRuleCRUD;
+import org.opendaylight.netvirt.openstack.netvirt.translator.crud.INeutronSubnetCRUD;
 import org.opendaylight.netvirt.utils.servicehelper.ServiceHelper;
 
 public class NeutronUtils {
@@ -36,16 +36,16 @@ public class NeutronUtils {
         np.setDeviceOwner(owner);
         np.setMacAddress(mac);
         np.setNetworkUUID(networkId);
-        List<org.opendaylight.neutron.spi.Neutron_IPs> srcAddressList =
+        List<org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs> srcAddressList =
                 new ArrayList<>();
-        org.opendaylight.neutron.spi.Neutron_IPs nip = new org.opendaylight.neutron.spi.Neutron_IPs();
+        org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs nip = new org.opendaylight.netvirt.openstack.netvirt.translator.Neutron_IPs();
         nip.setIpAddress(ipaddr);
         nip.setSubnetUUID(subnetId);
         srcAddressList.add(nip);
         np.setFixedIPs(srcAddressList);
         List<NeutronSecurityGroup> nsgs = Arrays.asList(secGroups);
         np.setSecurityGroups(nsgs);
-        iNeutronPortCRUD.add(np);
+        iNeutronPortCRUD.addPort(np);
         return np;
     }
 
@@ -65,7 +65,7 @@ public class NeutronUtils {
         ns.initDefaults();
         ns.setNetworkUUID(networkId);
         ns.setTenantID(tenantId);
-        iNeutronSubnetCRUD.add(ns);
+        iNeutronSubnetCRUD.addSubnet(ns);
         return ns;
     }
 
@@ -137,17 +137,17 @@ public class NeutronUtils {
         NeutronSecurityGroup sg = new NeutronSecurityGroup();
         sg.setSecurityGroupName("SG-" + id);
         sg.setID(id);
-        sg.setTenantID(tenantId);
+        sg.setSecurityGroupTenantID(tenantId);
 
         List<NeutronSecurityRule> ruleList = new ArrayList<>(rules.length);
         for (NeutronSecurityRule rule : rules) {
-            rule.setTenantID(tenantId);
+            rule.setSecurityRuleTenantID(tenantId);
             rule.setSecurityRuleGroupID(id);
             ruleList.add(rule);
             ruleCRUD.addNeutronSecurityRule(rule);
         }
 
-        groupCRUD.add(sg);
+        groupCRUD.addNeutronSecurityGroup(sg);
 
         return sg;
     }