commit | 982cc0ef2316b85106638e7b6586a984551b01d5 | [log] [tgz] |
---|---|---|
author | samanwita pal <sam@onlab.us> | Fri Aug 21 11:29:57 2015 -0700 |
committer | samanwita pal <sam@onlab.us> | Fri Aug 21 11:49:04 2015 -0700 |
tree | 11b5a09c522962e1ea886f160ee1703ff5264eba | |
parent | cdc5280b42e689b35c1b1c65bccbe0b67e20fe40 [diff] |
Adding DROP rule for failed intents + changing netconfig imports from incubator Change-Id: I95c0b8cdc51921c8b2c7e8f571d8b28251543f13
diff --git a/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPConfig.java b/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPConfig.java index 16fcdd7..f57ff3a 100644 --- a/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPConfig.java +++ b/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPConfig.java
@@ -16,7 +16,7 @@ package org.onosproject.dhcpserver.impl; import org.onosproject.core.ApplicationId; -import org.onosproject.incubator.net.config.Config; +import org.onosproject.net.config.Config; import org.onosproject.incubator.net.config.basics.BasicElementConfig; /**
diff --git a/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPManager.java b/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPManager.java index ccb9e67..96bb4c3 100644 --- a/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPManager.java +++ b/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPManager.java
@@ -36,10 +36,11 @@ import org.onosproject.core.CoreService; import org.onosproject.dhcpserver.DHCPService; import org.onosproject.dhcpserver.DHCPStore; -import org.onosproject.incubator.net.config.ConfigFactory; -import org.onosproject.incubator.net.config.NetworkConfigEvent; -import org.onosproject.incubator.net.config.NetworkConfigListener; -import org.onosproject.incubator.net.config.NetworkConfigRegistry; +import org.onosproject.net.config.ConfigFactory; +import org.onosproject.net.config.NetworkConfigEvent; +import org.onosproject.net.config.NetworkConfigListener; +import org.onosproject.net.config.NetworkConfigRegistry; + import org.onosproject.net.ConnectPoint; import org.onosproject.net.Host; import org.onosproject.net.HostId;
diff --git a/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPStoreConfig.java b/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPStoreConfig.java index edc389c..999527f 100644 --- a/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPStoreConfig.java +++ b/onos-app-dhcpserver/src/main/java/org/onosproject/dhcpserver/impl/DHCPStoreConfig.java
@@ -16,7 +16,7 @@ package org.onosproject.dhcpserver.impl; import org.onosproject.core.ApplicationId; -import org.onosproject.incubator.net.config.Config; +import org.onosproject.net.config.Config; import org.onosproject.incubator.net.config.basics.BasicElementConfig; /**