translator: remove dependency of neutron.spi

[netvirt.git] / utils / neutron-utils / src / main / java / org / opendaylight / netvirt / utils / neutron / utils / NeutronUtils.java

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;
     }