ONOSFW-171

O/S-SFC-ONOS scenario documentation

Change-Id: I51ae1cf736ea24ab6680f8edca1b2bf5dd598365
Signed-off-by: CNlucius <lukai1@huawei.com>

23 files changed, 0 insertions, 2862 deletions

diff --git a/framework/src/onos/apps/vtn/vtnmgr/pom.xml b/framework/src/onos/apps/vtn/vtnmgr/pom.xml
deleted file mode 100644
index 890b2168..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2015 Open Networking Laboratory
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-        xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-app-vtn</artifactId>
-        <version>1.4.0-rc1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-app-vtn-mgr</artifactId>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-incubator-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-serializers</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-vtn-rsc</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VTNService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VTNService.java
deleted file mode 100644
index d7ee3607..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VTNService.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.manager;
-
-import org.onosproject.net.Device;
-import org.onosproject.net.Host;
-import org.onosproject.vtnrsc.event.VtnRscEventFeedback;
-
-/**
- * VTN application that applies configuration and flows to the device.
- */
-public interface VTNService {
-
-    /**
-     * Creates a vxlan tunnel and creates the ovs when a ovs controller node is
-     * detected.
-     *
-     * @param device controller-type device
-     */
-    void onControllerDetected(Device device);
-
-    /**
-     * Drops a vxlan tunnel and drops the ovs when a ovs controller node is
-     * vanished.
-     *
-     * @param device controller-type device
-     */
-    void onControllerVanished(Device device);
-
-    /**
-     * Applies default forwarding flows when a ovs is detected.
-     *
-     * @param device switch-type device
-     */
-    void onOvsDetected(Device device);
-
-    /**
-     * Remove default forwarding flows when a ovs is vanished.
-     *
-     * @param device switch-type device
-     */
-    void onOvsVanished(Device device);
-
-    /**
-     * Applies multicast flows and tunnel flows when a VM is detected.
-     *
-     * @param host a VM
-     */
-    void onHostDetected(Host host);
-
-    /**
-     * Remove multicast flows and tunnel flows when a VM is vanished.
-     *
-     * @param host a VM
-     */
-    void onHostVanished(Host host);
-
-    /**
-     * Applies east west flows when neutron created router interface.
-     *
-     * @param l3Feedback VtnrscEventFeedback
-     */
-    void onRouterInterfaceDetected(VtnRscEventFeedback l3Feedback);
-
-    /**
-     * Remove east west flows when neutron removed router interface.
-     *
-     * @param l3Feedback VtnrscEventFeedback
-     */
-    void onRouterInterfaceVanished(VtnRscEventFeedback l3Feedback);
-
-    /**
-     * Applies north south flows when neutron bind floating ip.
-     *
-     * @param l3Feedback VtnrscEventFeedback
-     */
-    void onFloatingIpDetected(VtnRscEventFeedback l3Feedback);
-
-    /**
-     * Applies north south flows when neutron unbind floating ip.
-     *
-     * @param l3Feedback VtnrscEventFeedback
-     */
-    void onFloatingIpVanished(VtnRscEventFeedback l3Feedback);
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
deleted file mode 100644
index 6429314e..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.manager.impl;
-
-import static org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_TUNNEL_DST;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.Service;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onlab.util.KryoNamespace;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreService;
-import org.onosproject.mastership.MastershipService;
-import org.onosproject.net.AnnotationKeys;
-import org.onosproject.net.Device;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.Host;
-import org.onosproject.net.HostId;
-import org.onosproject.net.Port;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.BridgeConfig;
-import org.onosproject.net.behaviour.BridgeDescription;
-import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
-import org.onosproject.net.config.NetworkConfigService;
-import org.onosproject.net.config.basics.BasicDeviceConfig;
-import org.onosproject.net.device.DeviceEvent;
-import org.onosproject.net.device.DeviceListener;
-import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficTreatment.Builder;
-import org.onosproject.net.flow.instructions.ExtensionTreatment;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.net.group.DefaultGroupBucket;
-import org.onosproject.net.group.DefaultGroupDescription;
-import org.onosproject.net.group.DefaultGroupKey;
-import org.onosproject.net.group.GroupBucket;
-import org.onosproject.net.group.GroupBuckets;
-import org.onosproject.net.group.GroupDescription;
-import org.onosproject.net.group.GroupKey;
-import org.onosproject.net.group.GroupService;
-import org.onosproject.net.host.HostEvent;
-import org.onosproject.net.host.HostListener;
-import org.onosproject.net.host.HostService;
-import org.onosproject.store.serializers.KryoNamespaces;
-import org.onosproject.store.service.EventuallyConsistentMap;
-import org.onosproject.store.service.LogicalClockService;
-import org.onosproject.store.service.StorageService;
-import org.onosproject.vtn.manager.VTNService;
-import org.onosproject.vtn.table.ArpService;
-import org.onosproject.vtn.table.ClassifierService;
-import org.onosproject.vtn.table.DnatService;
-import org.onosproject.vtn.table.L2ForwardService;
-import org.onosproject.vtn.table.L3ForwardService;
-import org.onosproject.vtn.table.SnatService;
-import org.onosproject.vtn.table.impl.ClassifierServiceImpl;
-import org.onosproject.vtn.table.impl.L2ForwardServiceImpl;
-import org.onosproject.vtn.util.DataPathIdGenerator;
-import org.onosproject.vtn.util.VtnConfig;
-import org.onosproject.vtn.util.VtnData;
-import org.onosproject.vtnrsc.AllowedAddressPair;
-import org.onosproject.vtnrsc.BindingHostId;
-import org.onosproject.vtnrsc.DefaultVirtualPort;
-import org.onosproject.vtnrsc.FixedIp;
-import org.onosproject.vtnrsc.FloatingIp;
-import org.onosproject.vtnrsc.Router;
-import org.onosproject.vtnrsc.RouterGateway;
-import org.onosproject.vtnrsc.RouterId;
-import org.onosproject.vtnrsc.RouterInterface;
-import org.onosproject.vtnrsc.SecurityGroup;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.onosproject.vtnrsc.SubnetId;
-import org.onosproject.vtnrsc.TenantId;
-import org.onosproject.vtnrsc.TenantNetwork;
-import org.onosproject.vtnrsc.TenantNetworkId;
-import org.onosproject.vtnrsc.VirtualPort;
-import org.onosproject.vtnrsc.VirtualPortId;
-import org.onosproject.vtnrsc.event.VtnRscEvent;
-import org.onosproject.vtnrsc.event.VtnRscEventFeedback;
-import org.onosproject.vtnrsc.event.VtnRscListener;
-import org.onosproject.vtnrsc.floatingip.FloatingIpService;
-import org.onosproject.vtnrsc.router.RouterService;
-import org.onosproject.vtnrsc.routerinterface.RouterInterfaceService;
-import org.onosproject.vtnrsc.service.VtnRscService;
-import org.onosproject.vtnrsc.subnet.SubnetService;
-import org.onosproject.vtnrsc.tenantnetwork.TenantNetworkService;
-import org.onosproject.vtnrsc.virtualport.VirtualPortService;
-import org.slf4j.Logger;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-/**
- * Provides implementation of VTNService.
- */
-@Component(immediate = true)
-@Service
-public class VTNManager implements VTNService {
-    private final Logger log = getLogger(getClass());
-    private static final String APP_ID = "org.onosproject.app.vtn";
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected NetworkConfigService configService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected HostService hostService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected CoreService coreService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected StorageService storageService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected TenantNetworkService tenantNetworkService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected VirtualPortService virtualPortService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DriverService driverService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected LogicalClockService clockService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected MastershipService mastershipService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected GroupService groupService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected SubnetService subnetService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected VtnRscService vtnRscService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected FloatingIpService floatingIpService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected RouterService routerService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected RouterInterfaceService routerInterfaceService;
-
-    private ApplicationId appId;
-    private ClassifierService classifierService;
-    private L2ForwardService l2ForwardService;
-    private ArpService arpService;
-    private L3ForwardService l3ForwardService;
-    private SnatService snatService;
-    private DnatService dnatService;
-
-    private final HostListener hostListener = new InnerHostListener();
-    private final DeviceListener deviceListener = new InnerDeviceListener();
-    private final VtnRscListener l3EventListener = new VtnL3EventListener();
-
-    private static final String IFACEID = "ifaceid";
-    private static final String CONTROLLER_IP_KEY = "ipaddress";
-    public static final String DRIVER_NAME = "onosfw";
-    private static final String EX_PORT_NAME = "eth0";
-    private static final String VIRTUALPORT = "vtn-virtual-port";
-    private static final String SWITCHES_OF_CONTROLLER = "switchesOfController";
-    private static final String SWITCH_OF_LOCAL_HOST_PORTS = "switchOfLocalHostPorts";
-    private static final String ROUTERINF_FLAG_OF_TENANT = "routerInfFlagOfTenant";
-    private static final String HOSTS_OF_SUBNET = "hostsOfSubnet";
-    private static final String EX_PORT_OF_DEVICE = "exPortOfDevice";
-    private static final String DEFAULT_IP = "0.0.0.0";
-    private static final String PORT_MAC = "portMac";
-    private static final int SUBNET_NUM = 2;
-
-    private EventuallyConsistentMap<VirtualPortId, VirtualPort> vPortStore;
-    private EventuallyConsistentMap<IpAddress, Boolean> switchesOfController;
-    private EventuallyConsistentMap<DeviceId, NetworkOfLocalHostPorts> switchOfLocalHostPorts;
-    private EventuallyConsistentMap<SubnetId, Map<HostId, Host>> hostsOfSubnet;
-    private EventuallyConsistentMap<TenantId, Boolean> routerInfFlagOfTenant;
-    private EventuallyConsistentMap<DeviceId, Port> exPortOfDevice;
-
-    @Activate
-    public void activate() {
-        appId = coreService.registerApplication(APP_ID);
-        classifierService = new ClassifierServiceImpl(appId);
-        l2ForwardService = new L2ForwardServiceImpl(appId);
-
-        deviceService.addListener(deviceListener);
-        hostService.addListener(hostListener);
-
-        KryoNamespace.Builder serializer = KryoNamespace.newBuilder()
-                                .register(KryoNamespaces.API)
-                                .register(NetworkOfLocalHostPorts.class)
-                                .register(TenantNetworkId.class)
-                                .register(Host.class)
-                                .register(TenantNetwork.class)
-                                .register(TenantId.class)
-                                .register(SubnetId.class)
-                                .register(VirtualPortId.class)
-                                .register(VirtualPort.State.class)
-                                .register(AllowedAddressPair.class)
-                                .register(FixedIp.class)
-                                .register(BindingHostId.class)
-                                .register(SecurityGroup.class)
-                                .register(IpAddress.class)
-                                .register(DefaultVirtualPort.class);
-
-        vPortStore = storageService
-                .<VirtualPortId, VirtualPort>eventuallyConsistentMapBuilder()
-                .withName(VIRTUALPORT).withSerializer(serializer)
-                .withTimestampProvider((k, v) -> clockService.getTimestamp())
-                .build();
-
-        switchesOfController = storageService
-                .<IpAddress, Boolean>eventuallyConsistentMapBuilder()
-                .withName(SWITCHES_OF_CONTROLLER).withSerializer(serializer)
-                .withTimestampProvider((k, v) -> clockService.getTimestamp())
-                .build();
-
-        switchOfLocalHostPorts = storageService
-                .<DeviceId, NetworkOfLocalHostPorts>eventuallyConsistentMapBuilder()
-                .withName(SWITCH_OF_LOCAL_HOST_PORTS).withSerializer(serializer)
-                .withTimestampProvider((k, v) -> clockService.getTimestamp())
-                .build();
-
-        hostsOfSubnet = storageService
-                .<SubnetId, Map<HostId, Host>>eventuallyConsistentMapBuilder()
-                .withName(HOSTS_OF_SUBNET).withSerializer(serializer)
-                .withTimestampProvider((k, v) -> clockService.getTimestamp())
-                .build();
-
-        routerInfFlagOfTenant = storageService
-                .<TenantId, Boolean>eventuallyConsistentMapBuilder()
-                .withName(ROUTERINF_FLAG_OF_TENANT).withSerializer(serializer)
-                .withTimestampProvider((k, v) -> clockService.getTimestamp())
-                .build();
-
-        exPortOfDevice = storageService
-                .<DeviceId, Port>eventuallyConsistentMapBuilder()
-                .withName(EX_PORT_OF_DEVICE).withSerializer(serializer)
-                .withTimestampProvider((k, v) -> clockService.getTimestamp())
-                .build();
-
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        deviceService.removeListener(deviceListener);
-        hostService.removeListener(hostListener);
-        vtnRscService.removeListener(l3EventListener);
-        log.info("Stopped");
-    }
-
-    @Override
-    public void onControllerDetected(Device controllerDevice) {
-        if (controllerDevice == null) {
-            log.error("The controller device is null");
-            return;
-        }
-        String localIpAddress = controllerDevice.annotations()
-                .value(CONTROLLER_IP_KEY);
-        IpAddress localIp = IpAddress.valueOf(localIpAddress);
-        DeviceId controllerDeviceId = controllerDevice.id();
-        DriverHandler handler = driverService.createHandler(controllerDeviceId);
-        if (mastershipService.isLocalMaster(controllerDeviceId)) {
-            // Get DataPathIdGenerator
-            String ipaddress = controllerDevice.annotations().value("ipaddress");
-            DataPathIdGenerator dpidGenerator = DataPathIdGenerator.builder()
-                                            .addIpAddress(ipaddress).build();
-            DeviceId deviceId = dpidGenerator.getDeviceId();
-            String dpid = dpidGenerator.getDpId();
-            // Inject pipeline driver name
-            BasicDeviceConfig config = configService.addConfig(deviceId,
-                                                               BasicDeviceConfig.class);
-            config.driver(DRIVER_NAME);
-            configService.applyConfig(deviceId, BasicDeviceConfig.class, config.node());
-            // Add Bridge
-            VtnConfig.applyBridgeConfig(handler, dpid, EX_PORT_NAME);
-            log.info("A new ovs is created in node {}", localIp.toString());
-            switchesOfController.put(localIp, true);
-        }
-        // Create tunnel in br-int on all controllers
-        programTunnelConfig(controllerDeviceId, localIp, handler);
-    }
-
-    @Override
-    public void onControllerVanished(Device controllerDevice) {
-        if (controllerDevice == null) {
-            log.error("The device is null");
-            return;
-        }
-        String dstIp = controllerDevice.annotations().value(CONTROLLER_IP_KEY);
-        IpAddress dstIpAddress = IpAddress.valueOf(dstIp);
-        DeviceId controllerDeviceId = controllerDevice.id();
-        if (mastershipService.isLocalMaster(controllerDeviceId)) {
-            switchesOfController.remove(dstIpAddress);
-        }
-        // remove tunnel in br-int on other controllers
-        programTunnelConfig(controllerDeviceId, dstIpAddress, null);
-    }
-
-    @Override
-    public void onOvsDetected(Device device) {
-        // Create tunnel out flow rules
-        applyTunnelOut(device, Objective.Operation.ADD);
-    }
-
-    @Override
-    public void onOvsVanished(Device device) {
-        // Remove Tunnel out flow rules
-        applyTunnelOut(device, Objective.Operation.REMOVE);
-    }
-
-    @Override
-    public void onHostDetected(Host host) {
-        DeviceId deviceId = host.location().deviceId();
-        if (!mastershipService.isLocalMaster(deviceId)) {
-            return;
-        }
-        String ifaceId = host.annotations().value(IFACEID);
-        if (ifaceId == null) {
-            log.error("The ifaceId of Host is null");
-            return;
-        }
-        // apply L2 openflow rules
-        applyHostMonitoredL2Rules(host, Objective.Operation.ADD);
-        // apply L3 openflow rules
-        applyHostMonitoredL3Rules(host, Objective.Operation.ADD);
-    }
-
-    @Override
-    public void onHostVanished(Host host) {
-        DeviceId deviceId = host.location().deviceId();
-        if (!mastershipService.isLocalMaster(deviceId)) {
-            return;
-        }
-        String ifaceId = host.annotations().value(IFACEID);
-        if (ifaceId == null) {
-            log.error("The ifaceId of Host is null");
-            return;
-        }
-        // apply L2 openflow rules
-        applyHostMonitoredL2Rules(host, Objective.Operation.REMOVE);
-        // apply L3 openflow rules
-        applyHostMonitoredL3Rules(host, Objective.Operation.REMOVE);
-    }
-
-    private void programTunnelConfig(DeviceId localDeviceId, IpAddress localIp,
-                                     DriverHandler localHandler) {
-        if (mastershipService.isLocalMaster(localDeviceId)) {
-            VtnConfig.applyTunnelConfig(localHandler, localIp, IpAddress.valueOf(DEFAULT_IP));
-            log.info("Add tunnel on {}", localIp);
-        }
-    }
-
-    private void applyTunnelOut(Device device, Objective.Operation type) {
-        if (device == null) {
-            log.error("The device is null");
-            return;
-        }
-        if (!mastershipService.isLocalMaster(device.id())) {
-            return;
-        }
-        String controllerIp = VtnData.getControllerIpOfSwitch(device);
-        if (controllerIp == null) {
-            log.error("Can't find controller of device: {}",
-                      device.id().toString());
-            return;
-        }
-        IpAddress ipAddress = IpAddress.valueOf(controllerIp);
-        if (!switchesOfController.containsKey(ipAddress)) {
-            log.error("Can't find controller of device: {}",
-                      device.id().toString());
-            return;
-        }
-        if (type == Objective.Operation.ADD) {
-            switchOfLocalHostPorts.put(device.id(), new NetworkOfLocalHostPorts());
-        } else if (type == Objective.Operation.REMOVE) {
-            switchOfLocalHostPorts.remove(device.id());
-        }
-        Iterable<Device> devices = deviceService.getAvailableDevices();
-        DeviceId localControllerId = VtnData.getControllerId(device, devices);
-        DriverHandler handler = driverService.createHandler(localControllerId);
-        Set<PortNumber> ports = VtnConfig.getPortNumbers(handler);
-        Iterable<Host> allHosts = hostService.getHosts();
-        String tunnelName = "vxlan-" + DEFAULT_IP;
-        if (allHosts != null) {
-            Sets.newHashSet(allHosts).stream().forEach(host -> {
-                MacAddress hostMac = host.mac();
-                String ifaceId = host.annotations().value(IFACEID);
-                if (ifaceId == null) {
-                    log.error("The ifaceId of Host is null");
-                    return;
-                }
-                VirtualPortId virtualPortId = VirtualPortId.portId(ifaceId);
-                VirtualPort virtualPort = virtualPortService
-                        .getPort(virtualPortId);
-                TenantNetwork network = tenantNetworkService
-                        .getNetwork(virtualPort.networkId());
-                SegmentationId segmentationId = network.segmentationId();
-                DeviceId remoteDeviceId = host.location().deviceId();
-                Device remoteDevice = deviceService.getDevice(remoteDeviceId);
-                String remoteControllerIp = VtnData
-                        .getControllerIpOfSwitch(remoteDevice);
-                if (remoteControllerIp == null) {
-                    log.error("Can't find remote controller of device: {}",
-                              remoteDeviceId.toString());
-                    return;
-                }
-                IpAddress remoteIpAddress = IpAddress
-                        .valueOf(remoteControllerIp);
-                ports.stream()
-                        .filter(p -> p.name().equalsIgnoreCase(tunnelName))
-                        .forEach(p -> {
-                    l2ForwardService
-                            .programTunnelOut(device.id(), segmentationId, p,
-                                              hostMac, type, remoteIpAddress);
-                });
-            });
-        }
-    }
-
-    private void applyHostMonitoredL2Rules(Host host, Objective.Operation type) {
-        DeviceId deviceId = host.location().deviceId();
-        if (!mastershipService.isLocalMaster(deviceId)) {
-            return;
-        }
-        String ifaceId = host.annotations().value(IFACEID);
-        if (ifaceId == null) {
-            log.error("The ifaceId of Host is null");
-            return;
-        }
-        VirtualPortId virtualPortId = VirtualPortId.portId(ifaceId);
-        VirtualPort virtualPort = virtualPortService.getPort(virtualPortId);
-        if (virtualPort == null) {
-            virtualPort = VtnData.getPort(vPortStore, virtualPortId);
-        }
-
-        Iterable<Device> devices = deviceService.getAvailableDevices();
-        PortNumber inPort = host.location().port();
-        MacAddress mac = host.mac();
-        Device device = deviceService.getDevice(deviceId);
-        String controllerIp = VtnData.getControllerIpOfSwitch(device);
-        IpAddress ipAddress = IpAddress.valueOf(controllerIp);
-        TenantNetwork network = tenantNetworkService.getNetwork(virtualPort.networkId());
-        if (network == null) {
-            log.error("Can't find network of the host");
-            return;
-        }
-        SegmentationId segmentationId = network.segmentationId();
-        // Get all the tunnel PortNumber in the current node
-        Iterable<Port> ports = deviceService.getPorts(deviceId);
-        Collection<PortNumber> localTunnelPorts = VtnData.getLocalTunnelPorts(ports);
-        // Get all the local vm's PortNumber in the current node
-        Map<TenantNetworkId, Set<PortNumber>> localHostPorts = switchOfLocalHostPorts
-                .get(deviceId).getNetworkOfLocalHostPorts();
-        Set<PortNumber> networkOflocalHostPorts = localHostPorts.get(network.id());
-        for (PortNumber p : localTunnelPorts) {
-            programGroupTable(deviceId, appId, p, devices, type);
-        }
-
-        if (type == Objective.Operation.ADD) {
-            vPortStore.put(virtualPortId, virtualPort);
-            if (networkOflocalHostPorts == null) {
-                networkOflocalHostPorts = new HashSet<PortNumber>();
-                localHostPorts.putIfAbsent(network.id(), networkOflocalHostPorts);
-            }
-            networkOflocalHostPorts.add(inPort);
-            l2ForwardService.programLocalBcastRules(deviceId, segmentationId,
-                                                    inPort, networkOflocalHostPorts,
-                                                    localTunnelPorts,
-                                                    type);
-            classifierService.programTunnelIn(deviceId, segmentationId,
-                                              localTunnelPorts,
-                                              type);
-        } else if (type == Objective.Operation.REMOVE) {
-            vPortStore.remove(virtualPortId);
-            if (networkOflocalHostPorts != null) {
-                l2ForwardService.programLocalBcastRules(deviceId, segmentationId,
-                                                        inPort, networkOflocalHostPorts,
-                                                        localTunnelPorts,
-                                                        type);
-                networkOflocalHostPorts.remove(inPort);
-                if (networkOflocalHostPorts.isEmpty()) {
-                    classifierService.programTunnelIn(deviceId, segmentationId,
-                                                      localTunnelPorts,
-                                                      type);
-                    switchOfLocalHostPorts.get(deviceId).getNetworkOfLocalHostPorts()
-                                                .remove(virtualPort.networkId());
-                }
-            }
-        }
-
-        l2ForwardService.programLocalOut(deviceId, segmentationId, inPort, mac,
-                                         type);
-
-        l2ForwardService.programTunnelBcastRules(deviceId, segmentationId,
-                                                 networkOflocalHostPorts,
-                                                 localTunnelPorts,
-                                                 type);
-
-        programTunnelOuts(devices, ipAddress, segmentationId, mac,
-                          type);
-
-        classifierService.programLocalIn(deviceId, segmentationId, inPort, mac,
-                                         appId, type);
-    }
-
-    private void programTunnelOuts(Iterable<Device> devices,
-                                   IpAddress ipAddress,
-                                   SegmentationId segmentationId,
-                                   MacAddress dstMac,
-                                   Objective.Operation type) {
-        String tunnelName = "vxlan-" + DEFAULT_IP;
-        Sets.newHashSet(devices).stream()
-                .filter(d -> d.type() == Device.Type.CONTROLLER)
-                .filter(d -> !("ovsdb:" + ipAddress).equals(d.id().toString()))
-                .forEach(d -> {
-                    DriverHandler handler = driverService.createHandler(d.id());
-                    BridgeConfig bridgeConfig = handler
-                            .behaviour(BridgeConfig.class);
-                    Collection<BridgeDescription> bridgeDescriptions = bridgeConfig
-                            .getBridges();
-                    Set<PortNumber> ports = bridgeConfig.getPortNumbers();
-                    Iterator<BridgeDescription> it = bridgeDescriptions
-                            .iterator();
-                    if (it.hasNext()) {
-                        BridgeDescription sw = it.next();
-                        ports.stream()
-                                .filter(p -> p.name()
-                                        .equalsIgnoreCase(tunnelName))
-                                .forEach(p -> {
-                            l2ForwardService.programTunnelOut(sw.deviceId(),
-                                                              segmentationId, p,
-                                                              dstMac, type, ipAddress);
-                        });
-                    }
-                });
-    }
-
-    private class InnerDeviceListener implements DeviceListener {
-
-        @Override
-        public void event(DeviceEvent event) {
-            Device device = event.subject();
-            if (Device.Type.CONTROLLER == device.type()) {
-                if (DeviceEvent.Type.DEVICE_ADDED == event.type()) {
-                    onControllerDetected(device);
-                }
-                if (DeviceEvent.Type.DEVICE_AVAILABILITY_CHANGED == event.type()) {
-                    if (deviceService.isAvailable(device.id())) {
-                        onControllerDetected(device);
-                    } else {
-                        onControllerVanished(device);
-                    }
-                }
-            } else if (Device.Type.SWITCH == device.type()) {
-                if (DeviceEvent.Type.DEVICE_ADDED == event.type()) {
-                    onOvsDetected(device);
-                }
-                if (DeviceEvent.Type.DEVICE_AVAILABILITY_CHANGED == event.type()) {
-                    if (deviceService.isAvailable(device.id())) {
-                        onOvsDetected(device);
-                    } else {
-                        onOvsVanished(device);
-                    }
-                }
-            } else {
-                log.info("Do nothing for this device type");
-            }
-        }
-    }
-
-    private class InnerHostListener implements HostListener {
-
-        @Override
-        public void event(HostEvent event) {
-            Host host = event.subject();
-            if (HostEvent.Type.HOST_ADDED == event.type()) {
-                onHostDetected(host);
-            } else if (HostEvent.Type.HOST_REMOVED == event.type()) {
-                onHostVanished(host);
-            } else if (HostEvent.Type.HOST_UPDATED == event.type()) {
-                onHostVanished(host);
-                onHostDetected(host);
-            }
-        }
-
-    }
-
-    // Local Host Ports of Network.
-    private class NetworkOfLocalHostPorts {
-        private final Map<TenantNetworkId, Set<PortNumber>> networkOfLocalHostPorts =
-                                      new HashMap<TenantNetworkId, Set<PortNumber>>();
-
-        public Map<TenantNetworkId, Set<PortNumber>> getNetworkOfLocalHostPorts() {
-            return networkOfLocalHostPorts;
-        }
-    }
-
-    private void programGroupTable(DeviceId deviceId, ApplicationId appid,
-                                   PortNumber portNumber, Iterable<Device> devices, Objective.Operation type) {
-        if (type.equals(Objective.Operation.REMOVE)) {
-            return;
-        }
-
-        List<GroupBucket> buckets = Lists.newArrayList();
-        Sets.newHashSet(devices)
-        .stream()
-        .filter(d -> d.type() == Device.Type.CONTROLLER)
-        .filter(d -> !deviceId.equals(d.id()))
-        .forEach(d -> {
-                    String ipAddress = d.annotations()
-                             .value(CONTROLLER_IP_KEY);
-                    Ip4Address dst = Ip4Address.valueOf(ipAddress);
-                    Builder builder = DefaultTrafficTreatment.builder();
-
-                    DriverHandler handler = driverService.createHandler(deviceId);
-                    ExtensionTreatmentResolver resolver =  handler.behaviour(ExtensionTreatmentResolver.class);
-                    ExtensionTreatment treatment = resolver.getExtensionInstruction(NICIRA_SET_TUNNEL_DST.type());
-                    try {
-                        treatment.setPropertyValue("tunnelDst", dst);
-                    } catch (Exception e) {
-                       log.error("Failed to get extension instruction to set tunnel dst {}", deviceId);
-                    }
-
-                    builder.extension(treatment, deviceId);
-                    builder.setOutput(portNumber);
-                    GroupBucket bucket = DefaultGroupBucket
-                            .createAllGroupBucket(builder.build());
-                    buckets.add(bucket);
-                 });
-        final GroupKey key = new DefaultGroupKey(APP_ID.getBytes());
-        GroupDescription groupDescription = new DefaultGroupDescription(deviceId,
-                                                                        GroupDescription.Type.ALL,
-                                                                        new GroupBuckets(buckets),
-                                                                        key,
-                                                                        L2ForwardServiceImpl.GROUP_ID,
-                                                                        appid);
-        groupService.addGroup(groupDescription);
-    }
-
-    private class VtnL3EventListener implements VtnRscListener {
-        @Override
-        public void event(VtnRscEvent event) {
-            VtnRscEventFeedback l3Feedback = event.subject();
-            if (VtnRscEvent.Type.ROUTER_INTERFACE_PUT == event.type()) {
-                onRouterInterfaceDetected(l3Feedback);
-            } else
-                if (VtnRscEvent.Type.ROUTER_INTERFACE_DELETE == event.type()) {
-                onRouterInterfaceVanished(l3Feedback);
-            } else if (VtnRscEvent.Type.FLOATINGIP_PUT == event.type()) {
-                onFloatingIpDetected(l3Feedback);
-            } else if (VtnRscEvent.Type.FLOATINGIP_DELETE == event.type()) {
-                onFloatingIpVanished(l3Feedback);
-            }
-        }
-
-    }
-
-    @Override
-    public void onRouterInterfaceDetected(VtnRscEventFeedback l3Feedback) {
-        Objective.Operation operation = Objective.Operation.ADD;
-        RouterInterface routerInf = l3Feedback.routerInterface();
-        Iterable<RouterInterface> interfaces = routerInterfaceService
-                .getRouterInterfaces();
-        Set<RouterInterface> interfacesSet = Sets.newHashSet(interfaces)
-                .stream().filter(r -> r.tenantId().equals(routerInf.tenantId()))
-                .collect(Collectors.toSet());
-        if (routerInfFlagOfTenant.get(routerInf.tenantId()) != null) {
-            programRouterInterface(routerInf, operation);
-        } else {
-            if (interfacesSet.size() >= SUBNET_NUM) {
-                programInterfacesSet(interfacesSet, operation);
-            }
-        }
-    }
-
-    @Override
-    public void onRouterInterfaceVanished(VtnRscEventFeedback l3Feedback) {
-        Objective.Operation operation = Objective.Operation.REMOVE;
-        RouterInterface routerInf = l3Feedback.routerInterface();
-        Iterable<RouterInterface> interfaces = routerInterfaceService
-                .getRouterInterfaces();
-        Set<RouterInterface> interfacesSet = Sets.newHashSet(interfaces)
-                .stream().filter(r -> r.tenantId().equals(routerInf.tenantId()))
-                .collect(Collectors.toSet());
-        if (routerInfFlagOfTenant.get(routerInf.tenantId()) != null) {
-            programRouterInterface(routerInf, operation);
-            if (interfacesSet.size() == 1) {
-                routerInfFlagOfTenant.remove(routerInf.tenantId());
-                interfacesSet.stream().forEach(r -> {
-                    programRouterInterface(r, operation);
-                });
-            }
-        }
-    }
-
-    @Override
-    public void onFloatingIpDetected(VtnRscEventFeedback l3Feedback) {
-        programFloatingIpEvent(l3Feedback, VtnRscEvent.Type.FLOATINGIP_PUT);
-    }
-
-    @Override
-    public void onFloatingIpVanished(VtnRscEventFeedback l3Feedback) {
-        programFloatingIpEvent(l3Feedback, VtnRscEvent.Type.FLOATINGIP_DELETE);
-    }
-
-    private void programInterfacesSet(Set<RouterInterface> interfacesSet,
-                                      Objective.Operation operation) {
-        int subnetVmNum = 0;
-        for (RouterInterface r : interfacesSet) {
-            // Get all the host of the subnet
-            Map<HostId, Host> hosts = hostsOfSubnet.get(r.subnetId());
-            if (hosts.size() > 0) {
-                subnetVmNum++;
-                if (subnetVmNum >= SUBNET_NUM) {
-                    routerInfFlagOfTenant.put(r.tenantId(), true);
-                    interfacesSet.stream().forEach(f -> {
-                        programRouterInterface(f, operation);
-                    });
-                    break;
-                }
-            }
-        }
-    }
-
-    private void programRouterInterface(RouterInterface routerInf,
-                                        Objective.Operation operation) {
-        SegmentationId l3vni = vtnRscService.getL3vni(routerInf.tenantId());
-        // Get all the host of the subnet
-        Map<HostId, Host> hosts = hostsOfSubnet.get(routerInf.subnetId());
-        hosts.values().stream().forEach(h -> {
-            applyEastWestL3Flows(h, l3vni, operation);
-        });
-    }
-
-    private void applyEastWestL3Flows(Host h, SegmentationId l3vni,
-                                      Objective.Operation operation) {
-        if (!mastershipService.isLocalMaster(h.location().deviceId())) {
-            log.debug("not master device:{}", h.location().deviceId());
-            return;
-        }
-        String ifaceId = h.annotations().value(IFACEID);
-        VirtualPort hPort = virtualPortService
-                .getPort(VirtualPortId.portId(ifaceId));
-        if (hPort == null) {
-            hPort = VtnData.getPort(vPortStore, VirtualPortId.portId(ifaceId));
-        }
-        IpAddress srcIp = null;
-        IpAddress srcGwIp = null;
-        MacAddress srcVmGwMac = null;
-        SubnetId srcSubnetId = null;
-        Iterator<FixedIp> srcIps = hPort.fixedIps().iterator();
-        if (srcIps.hasNext()) {
-            FixedIp fixedIp = srcIps.next();
-            srcIp = fixedIp.ip();
-            srcSubnetId = fixedIp.subnetId();
-            srcGwIp = subnetService.getSubnet(srcSubnetId).gatewayIp();
-            FixedIp fixedGwIp = FixedIp.fixedIp(srcSubnetId, srcGwIp);
-            VirtualPort gwPort = virtualPortService.getPort(fixedGwIp);
-            if (gwPort == null) {
-                gwPort = VtnData.getPort(vPortStore, fixedGwIp);
-            }
-            srcVmGwMac = gwPort.macAddress();
-        }
-        TenantNetwork network = tenantNetworkService
-                .getNetwork(hPort.networkId());
-        // Classifier rules
-        classifierService
-                .programL3InPortClassifierRules(h.location().deviceId(),
-                                                h.location().port(), h.mac(),
-                                                srcVmGwMac, l3vni, operation);
-        // Arp rules
-        if (operation == Objective.Operation.ADD) {
-            classifierService.programArpClassifierRules(h.location().deviceId(),
-                                                        srcGwIp,
-                                                        network.segmentationId(),
-                                                        operation);
-            DriverHandler handler = driverService.createHandler(h.location().deviceId());
-            arpService.programArpRules(handler, h.location().deviceId(), srcGwIp,
-                                       network.segmentationId(), srcVmGwMac,
-                                       operation);
-        }
-        Iterable<Device> devices = deviceService.getAvailableDevices();
-        IpAddress srcArpIp = srcIp;
-        MacAddress srcArpGwMac = srcVmGwMac;
-        Sets.newHashSet(devices).stream()
-                .filter(d -> Device.Type.SWITCH == d.type()).forEach(d -> {
-                    // L3FWD rules
-                    l3ForwardService.programRouteRules(d.id(), l3vni, srcArpIp,
-                                                       network.segmentationId(),
-                                                       srcArpGwMac, h.mac(),
-                                                       operation);
-                });
-    }
-
-    private void programFloatingIpEvent(VtnRscEventFeedback l3Feedback,
-                                       VtnRscEvent.Type type) {
-        FloatingIp floaingIp = l3Feedback.floatingIp();
-        if (floaingIp != null) {
-            VirtualPortId vmPortId = floaingIp.portId();
-            VirtualPort vmPort = virtualPortService.getPort(vmPortId);
-            VirtualPort fipPort = virtualPortService
-                    .getPort(floaingIp.networkId(), floaingIp.floatingIp());
-            if (vmPort == null) {
-                vmPort = VtnData.getPort(vPortStore, vmPortId);
-            }
-            if (fipPort == null) {
-                fipPort = VtnData.getPort(vPortStore, floaingIp.networkId(),
-                                          floaingIp.floatingIp());
-            }
-            Set<Host> hostSet = hostService.getHostsByMac(vmPort.macAddress());
-            Host host = null;
-            for (Host h : hostSet) {
-                String ifaceid = h.annotations().value(IFACEID);
-                if (ifaceid != null && ifaceid.equals(vmPortId.portId())) {
-                    host = h;
-                    break;
-                }
-            }
-            if (host != null && vmPort != null && fipPort != null) {
-                DeviceId deviceId = host.location().deviceId();
-                Port exPort = exPortOfDevice.get(deviceId);
-                SegmentationId l3vni = vtnRscService
-                        .getL3vni(vmPort.tenantId());
-                // Floating ip BIND
-                if (type == VtnRscEvent.Type.FLOATINGIP_PUT) {
-                    applyNorthSouthL3Flows(deviceId, host, vmPort, fipPort,
-                                           floaingIp, l3vni, exPort,
-                                           Objective.Operation.ADD);
-                } else if (type == VtnRscEvent.Type.FLOATINGIP_DELETE) {
-                    // Floating ip UNBIND
-                    applyNorthSouthL3Flows(deviceId, host, vmPort, fipPort,
-                                           floaingIp, l3vni, exPort,
-                                           Objective.Operation.REMOVE);
-                }
-            }
-        }
-    }
-
-    private void applyNorthSouthL3Flows(DeviceId deviceId, Host host,
-                                        VirtualPort vmPort, VirtualPort fipPort,
-                                        FloatingIp floatingIp,
-                                        SegmentationId l3Vni, Port exPort,
-                                        Objective.Operation operation) {
-        if (!mastershipService.isLocalMaster(deviceId)) {
-            log.debug("not master device:{}", deviceId);
-            return;
-        }
-        List gwIpMac = getGwIpAndMac(vmPort);
-        IpAddress dstVmGwIp = (IpAddress) gwIpMac.get(0);
-        MacAddress dstVmGwMac = (MacAddress) gwIpMac.get(1);
-        FixedIp fixedGwIp = getGwFixedIp(floatingIp);
-        MacAddress fGwMac = null;
-        if (fixedGwIp != null) {
-            VirtualPort gwPort = virtualPortService.getPort(fixedGwIp);
-            if (gwPort == null) {
-                gwPort = VtnData.getPort(vPortStore, fixedGwIp);
-            }
-            fGwMac = gwPort.macAddress();
-        }
-        TenantNetwork vmNetwork = tenantNetworkService
-                .getNetwork(vmPort.networkId());
-        TenantNetwork fipNetwork = tenantNetworkService
-                .getNetwork(fipPort.networkId());
-        // L3 downlink traffic flow
-        MacAddress exPortMac = MacAddress.valueOf(exPort.annotations().value(PORT_MAC));
-        classifierService.programArpClassifierRules(deviceId, floatingIp.floatingIp(),
-                                                    fipNetwork.segmentationId(),
-                                                    operation);
-        classifierService.programL3ExPortClassifierRules(deviceId, exPort.number(),
-                                                         floatingIp.floatingIp(), operation);
-        DriverHandler handler = driverService.createHandler(deviceId);
-        arpService.programArpRules(handler, deviceId, floatingIp.floatingIp(),
-                                         fipNetwork.segmentationId(), exPortMac,
-                                         operation);
-        dnatService.programRules(deviceId, floatingIp.floatingIp(),
-                                     fGwMac, floatingIp.fixedIp(),
-                                     l3Vni, operation);
-        l3ForwardService
-                .programRouteRules(deviceId, l3Vni, floatingIp.fixedIp(),
-                                   vmNetwork.segmentationId(), dstVmGwMac,
-                                   vmPort.macAddress(), operation);
-
-        // L3 uplink traffic flow
-        classifierService.programL3InPortClassifierRules(deviceId,
-                                                         host.location().port(),
-                                                         host.mac(), dstVmGwMac,
-                                                         l3Vni, operation);
-        snatService.programRules(deviceId, l3Vni, floatingIp.fixedIp(),
-                                     fGwMac, exPortMac,
-                                     floatingIp.floatingIp(),
-                                     fipNetwork.segmentationId(), operation);
-        if (operation == Objective.Operation.ADD) {
-            classifierService.programArpClassifierRules(deviceId, dstVmGwIp,
-                                                        vmNetwork.segmentationId(),
-                                                        operation);
-            arpService.programArpRules(handler, deviceId, dstVmGwIp,
-                                       vmNetwork.segmentationId(), dstVmGwMac,
-                                       operation);
-            l2ForwardService.programLocalOut(deviceId,
-                                             fipNetwork.segmentationId(),
-                                             exPort.number(), fGwMac, operation);
-        }
-    }
-
-    private Port getExPort(DeviceId deviceId) {
-        List<Port> ports = deviceService.getPorts(deviceId);
-        Port exPort = null;
-        for (Port port : ports) {
-            String portName = port.annotations().value(AnnotationKeys.PORT_NAME);
-            if (portName != null && portName.equals(EX_PORT_NAME)) {
-                exPort = port;
-                break;
-            }
-        }
-        return exPort;
-    }
-
-    private List getGwIpAndMac(VirtualPort port) {
-        List list = new ArrayList();
-        MacAddress gwMac = null;
-        SubnetId subnetId = null;
-        IpAddress gwIp = null;
-        Iterator<FixedIp> fixips = port.fixedIps().iterator();
-        if (fixips.hasNext()) {
-            FixedIp fixip = fixips.next();
-            subnetId = fixip.subnetId();
-            gwIp = subnetService.getSubnet(subnetId).gatewayIp();
-            FixedIp fixedGwIp = FixedIp.fixedIp(fixip.subnetId(), gwIp);
-            VirtualPort gwPort = virtualPortService.getPort(fixedGwIp);
-            if (gwPort == null) {
-                gwPort = VtnData.getPort(vPortStore, fixedGwIp);
-            }
-            gwMac = gwPort.macAddress();
-        }
-        list.add(gwIp);
-        list.add(gwMac);
-        return list;
-    }
-
-    private FixedIp getGwFixedIp(FloatingIp floatingIp) {
-        RouterId routerId = floatingIp.routerId();
-        Router router = routerService.getRouter(routerId);
-        RouterGateway routerGateway = router.externalGatewayInfo();
-        Iterable<FixedIp> externalFixedIps = routerGateway.externalFixedIps();
-        FixedIp fixedGwIp = null;
-        if (externalFixedIps != null) {
-            Iterator<FixedIp> exFixedIps = externalFixedIps.iterator();
-            if (exFixedIps.hasNext()) {
-                fixedGwIp = exFixedIps.next();
-            }
-        }
-        return fixedGwIp;
-    }
-
-    private void applyHostMonitoredL3Rules(Host host,
-                                           Objective.Operation operation) {
-        String ifaceId = host.annotations().value(IFACEID);
-        DeviceId deviceId = host.location().deviceId();
-        VirtualPortId portId = VirtualPortId.portId(ifaceId);
-        VirtualPort port = virtualPortService.getPort(portId);
-        if (port == null) {
-            port = VtnData.getPort(vPortStore, portId);
-        }
-        TenantId tenantId = port.tenantId();
-        Port exPort = exPortOfDevice.get(deviceId);
-        SegmentationId l3vni = vtnRscService.getL3vni(tenantId);
-        Iterator<FixedIp> fixips = port.fixedIps().iterator();
-        SubnetId sid = null;
-        IpAddress hostIp = null;
-        if (fixips.hasNext()) {
-            FixedIp fixip = fixips.next();
-            sid = fixip.subnetId();
-            hostIp = fixip.ip();
-        }
-        final SubnetId subnetId = sid;
-        // L3 internal network access to each other
-        Iterable<RouterInterface> interfaces = routerInterfaceService
-                .getRouterInterfaces();
-        Set<RouterInterface> interfacesSet = Sets.newHashSet(interfaces)
-                .stream().filter(r -> r.tenantId().equals(tenantId))
-                .collect(Collectors.toSet());
-        long count = interfacesSet.stream()
-                .filter(r -> !r.subnetId().equals(subnetId)).count();
-        if (count > 0) {
-            if (operation == Objective.Operation.ADD) {
-                if (routerInfFlagOfTenant.get(tenantId) != null) {
-                    applyEastWestL3Flows(host, l3vni, operation);
-                } else {
-                    if (interfacesSet.size() > 1) {
-                        programInterfacesSet(interfacesSet, operation);
-                    }
-                }
-            } else if (operation == Objective.Operation.REMOVE) {
-                if (routerInfFlagOfTenant.get(tenantId) != null) {
-                    applyEastWestL3Flows(host, l3vni, operation);
-                }
-            }
-        }
-        // L3 external and internal network access to each other
-        FloatingIp floatingIp = null;
-        Iterable<FloatingIp> floatingIps = floatingIpService.getFloatingIps();
-        Set<FloatingIp> floatingIpSet = Sets.newHashSet(floatingIps).stream()
-                .filter(f -> f.tenantId().equals(tenantId))
-                .collect(Collectors.toSet());
-        for (FloatingIp f : floatingIpSet) {
-            IpAddress fixedIp = f.fixedIp();
-            if (fixedIp.equals(hostIp)) {
-                floatingIp = f;
-                break;
-            }
-        }
-        if (floatingIp != null) {
-            VirtualPort fipPort = virtualPortService
-                    .getPort(floatingIp.networkId(), floatingIp.floatingIp());
-            if (fipPort == null) {
-                fipPort = VtnData.getPort(vPortStore, floatingIp.networkId(),
-                                          floatingIp.floatingIp());
-            }
-            applyNorthSouthL3Flows(deviceId, host, port, fipPort, floatingIp,
-                                   l3vni, exPort, operation);
-        }
-    }
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/package-info.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/package-info.java
deleted file mode 100644
index 4c9a58cc..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * VTN application that applies configuration and flows to the device.
- */
-package org.onosproject.vtn.manager.impl;
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/package-info.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/package-info.java
deleted file mode 100644
index 09bd80f8..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * VTN application that applies configuration and flows to the device.
- */
-package org.onosproject.vtn.manager;
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/ArpService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/ArpService.java
deleted file mode 100644
index ebb9ac3b..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/ArpService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtnrsc.SegmentationId;
-
-
-/**
- * ArpService interface providing the rules in ARP table which is Table(10).
- */
-public interface ArpService {
-
-    /**
-     * Assemble the arp rules.
-     * Match: arp type, vnid and destination ip.
-     * Action: set arp_operation, move arp_eth_src to arp_eth_dst, set arp_eth_src,
-     * move arp_ip_src to arp_ip_dst, set arp_ip_src, set output port.
-     *
-     * @param hander DriverHandler
-     * @param deviceId Device Id
-     * @param dstIP destination ip
-     * @param matchVni the vni of the source network (l2vni)
-     * @param dstMac destination mac
-     * @param type the operation type of the flow rules
-     */
-    void programArpRules(DriverHandler hander, DeviceId deviceId, IpAddress dstIP,
-                                SegmentationId matchVni, MacAddress dstMac,
-                                Objective.Operation type);
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/ClassifierService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/ClassifierService.java
deleted file mode 100644
index 69e951a2..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/ClassifierService.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtnrsc.SegmentationId;
-
-/**
- * Applies classifier flows to the device. Classifier table is Table(0).
- */
-public interface ClassifierService {
-
-    /**
-     * The port rule that message from host matches Table(0) Match: host mac and
-     * ingress port Action: set vnid and go to L2Forward Table(50).
-     *
-     * @param deviceId Device Id
-     * @param segmentationId the vnid of the host belong to
-     * @param inPort the ingress port of the host
-     * @param srcMac the mac of the host
-     * @param appId the application ID of the vtn
-     * @param type the operation of the flow
-     */
-    void programLocalIn(DeviceId deviceId, SegmentationId segmentationId,
-                        PortNumber inPort, MacAddress srcMac,
-                        ApplicationId appId, Objective.Operation type);
-
-    /**
-     * The port rule that message from tunnel Table(0) Match: tunnel port and
-     * vnid Action: go to L2Forward Table(50).
-     *
-     * @param deviceId Device Id
-     * @param segmentationId the vnid of the host belong to
-     * @param localTunnelPorts the tunnel pors of the device
-     * @param type the operation of the flow
-     */
-    void programTunnelIn(DeviceId deviceId, SegmentationId segmentationId,
-                         Iterable<PortNumber> localTunnelPorts,
-                         Objective.Operation type);
-
-    /**
-     * Assemble the L3 Classifier table rules which are sended from external port.
-     * Match: ipv4 type, ingress port and destination ip.
-     * Action: go to DNAT Table(20).
-     *
-     * @param deviceId Device Id
-     * @param inPort external port
-     * @param dstIp floating ip
-     * @param type the operation type of the flow rules
-     */
-    void programL3ExPortClassifierRules(DeviceId deviceId, PortNumber inPort,
-                                        IpAddress dstIp,
-                                        Objective.Operation type);
-
-    /**
-     * Assemble the L3 Classifier table rules which are sended from internal port.
-     * Match: ingress port, source mac and destination mac.
-     * Action: set vnid and go to L3Forward Table(30).
-     *
-     * @param deviceId Device Id
-     * @param inPort the ingress port of the host
-     * @param srcMac source mac
-     * @param dstMac destination vm gateway mac
-     * @param actionVni the vni of L3 network
-     * @param type the operation type of the flow rules
-     */
-    void programL3InPortClassifierRules(DeviceId deviceId,
-                                          PortNumber inPort, MacAddress srcMac,
-                                          MacAddress dstMac,
-                                          SegmentationId actionVni,
-                                          Objective.Operation type);
-
-    /**
-     * Assemble the Arp Classifier table rules.
-     * Match: arp type and destination ip.
-     * Action: set vnid and go to ARP Table(10).
-     *
-     * @param deviceId Device Id
-     * @param dstIp source gateway ip
-     * @param actionVni the vni of the source network (l2vni)
-     * @param type the operation type of the flow rules
-     */
-    void programArpClassifierRules(DeviceId deviceId, IpAddress dstIp,
-                                   SegmentationId actionVni,
-                                   Objective.Operation type);
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/DnatService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/DnatService.java
deleted file mode 100644
index 88c56288..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/DnatService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtnrsc.SegmentationId;
-
-/**
- * DnatService interface provides the rules in DNAT table which is Table(20) for ovs pipeline.
- * DNAT means Destination Network Address Translation, it is acronym for network terminology.
- * Handle the downward flows.
- */
-public interface DnatService {
-
-    /**
-     * Assemble the DNAT table rules.
-     * Match: ipv4 type and destination ip.
-     * Action: set eth_src, set ip_dst, set vnid and goto L3Forward Table(30).
-     *
-     * @param deviceId Device Id
-     * @param dstIp floating ip
-     * @param ethSrc floating ip gateway mac
-     * @param ipDst destination vm ip
-     * @param actionVni the vni of L3 network
-     * @param type the operation type of the flow rules
-     */
-    void programRules(DeviceId deviceId, IpAddress dstIp,
-                          MacAddress ethSrc, IpAddress ipDst,
-                          SegmentationId actionVni, Objective.Operation type);
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/L2ForwardService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/L2ForwardService.java
deleted file mode 100644
index cb661f8b..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/L2ForwardService.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtnrsc.SegmentationId;
-
-/**
- * Applies L2 flows to the device. L2Forward table is Table(50).
- */
-public interface L2ForwardService {
-
-    /**
-     * The local broadcast rule that message matches Table(50).
-     * Match: broadcast mac and vnid.
-     * Action: set output port.
-     *
-     * @param deviceId Device Id
-     * @param segmentationId the vnid of the host belong to
-     * @param inPort the ingress port of the host
-     * @param localVmPorts the local ports of the network which connect host
-     * @param localTunnelPorts the tunnel pors of the device
-     * @param type the operation of the flow
-     */
-    void programLocalBcastRules(DeviceId deviceId,
-                                SegmentationId segmentationId,
-                                PortNumber inPort,
-                                Iterable<PortNumber> localVmPorts,
-                                Iterable<PortNumber> localTunnelPorts,
-                                Objective.Operation type);
-
-    /**
-     * The tunnel broadcast rule that message matches Table(50).
-     * Match: broadcast mac and vnid.
-     * Action: output port.
-     *
-     * @param deviceId Device Id
-     * @param segmentationId the vnid of the host belong to
-     * @param localVmPorts the local ports of the network which connect host
-     * @param localTunnelPorts the tunnel pors of the device
-     * @param type the operation of the flow
-     */
-    void programTunnelBcastRules(DeviceId deviceId,
-                                 SegmentationId segmentationId,
-                                 Iterable<PortNumber> localVmPorts,
-                                 Iterable<PortNumber> localTunnelPorts,
-                                 Objective.Operation type);
-
-    /**
-     * The local out rule that message matches Table(50).
-     * Match: local host mac and vnid.
-     * Action: output local host port.
-     *
-     * @param deviceId Device Id
-     * @param segmentationId the vnid of the host belong to
-     * @param outPort the ingress port of the host
-     * @param sourceMac the mac of the host
-     * @param type the operation of the flow
-     */
-    void programLocalOut(DeviceId deviceId, SegmentationId segmentationId,
-                         PortNumber outPort, MacAddress sourceMac,
-                         Objective.Operation type);
-
-    /**
-     * The tunnel out rule that message matches Table(50).
-     * Match: host mac and vnid.
-     * Action: output tunnel port.
-     *
-     * @param deviceId Device Id
-     * @param segmentationId the vnid of the host belong to
-     * @param tunnelOutPort the port of the tunnel
-     * @param dstMac the mac of the host
-     * @param type the operation of the flow
-     * @param ipAddress the ipAddress of the node
-     */
-    void programTunnelOut(DeviceId deviceId, SegmentationId segmentationId,
-                          PortNumber tunnelOutPort, MacAddress dstMac,
-                          Objective.Operation type, IpAddress ipAddress);
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/L3ForwardService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/L3ForwardService.java
deleted file mode 100644
index 718253a4..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/L3ForwardService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtnrsc.SegmentationId;
-
-/**
- * L3ForwardService interface provide the rules in L3Forward table which is Table(30).
- */
-public interface L3ForwardService {
-
-    /**
-     * Assemble the L3Forward table rules.
-     * Match: ipv4 type, vnid and destination ip.
-     * Action: set eth_src, set eth_dst, set vnid and goto L2Forward Table(50).
-     *
-     * @param deviceId Device Id
-     * @param l3Vni the vni of L3 network
-     * @param dstVmIP destination vm ip
-     * @param dstVni the vni of the destination network (l2vni)
-     * @param dstVmGwMac destination VM gateway mac
-     * @param dstVmMac destination VM mac
-     * @param type the operation type of the flow rules
-     */
-    void programRouteRules(DeviceId deviceId, SegmentationId l3Vni,
-                           IpAddress dstVmIP, SegmentationId dstVni,
-                           MacAddress dstVmGwMac, MacAddress dstVmMac,
-                           Objective.Operation type);
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/SnatService.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/SnatService.java
deleted file mode 100644
index e57596ed..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/SnatService.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table;
-
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtnrsc.SegmentationId;
-
-/**
- * SnatService interface provides the rules in SNAT table which is Table(40) for ovs pipeline.
- * SNAT means Source Network Address Translation, it is acronym for network terminology.
- * Handle the upward flows.
- */
-public interface SnatService {
-
-    /**
-     * Assemble the SNAT table rules.
-     * Match: ipv4 type, vnid and source ip.
-     * Action: set eth_src, set eth_dst, set ip_src, set vnid and goto L2Forward Table(50).
-     *
-     * @param deviceId Device Id
-     * @param matchVni the vni of L3 network
-     * @param srcIP source ip
-     * @param ethDst external gateway mac
-     * @param ethSrc external port mac
-     * @param ipSrc floating ip
-     * @param actionVni external network VNI
-     * @param type the operation type of the flow rules
-     */
-    void programRules(DeviceId deviceId, SegmentationId matchVni,
-                          IpAddress srcIP, MacAddress ethDst,
-                          MacAddress ethSrc, IpAddress ipSrc,
-                          SegmentationId actionVni, Objective.Operation type);
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ArpServiceImpl.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ArpServiceImpl.java
deleted file mode 100644
index 574d15a7..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ArpServiceImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.EthType.EtherType;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.instructions.ExtensionTreatment;
-import org.onosproject.net.flow.instructions.ExtensionTreatmentType;
-import org.onosproject.net.flowobjective.DefaultForwardingObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.net.flowobjective.Objective.Operation;
-import org.onosproject.vtn.table.ArpService;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.slf4j.Logger;
-
-/**
- * ArpTable class providing the rules in ARP table.
- */
-public class ArpServiceImpl implements ArpService {
-    private final Logger log = getLogger(getClass());
-
-    private static final int ARP_PRIORITY = 0xffff;
-    private static final short ARP_RESPONSE = 0x2;
-    private static final EtherType ARP_TYPE = EtherType.ARP;
-
-    private final FlowObjectiveService flowObjectiveService;
-    private final ApplicationId appId;
-
-    /**
-     * Construct a ArpServiceImpl object.
-     *
-     * @param appId the application id of vtn
-     */
-    public ArpServiceImpl(ApplicationId appId) {
-        this.appId = checkNotNull(appId, "ApplicationId can not be null");
-        ServiceDirectory serviceDirectory = new DefaultServiceDirectory();
-        this.flowObjectiveService = serviceDirectory.get(FlowObjectiveService.class);
-    }
-
-    @Override
-    public void programArpRules(DriverHandler hander, DeviceId deviceId,
-                                IpAddress dstIP, SegmentationId srcVni,
-                                     MacAddress dstMac, Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(ARP_TYPE.ethType().toShort())
-                .matchArpTpa(Ip4Address.valueOf(dstIP.toString()))
-                .matchTunnelId(Long.parseLong(srcVni.segmentationId())).build();
-
-        ExtensionTreatmentResolver resolver = hander
-                .behaviour(ExtensionTreatmentResolver.class);
-        ExtensionTreatment ethSrcToDst = resolver
-                .getExtensionInstruction(ExtensionTreatmentType.ExtensionTreatmentTypes
-                                         .NICIRA_MOV_ETH_SRC_TO_DST.type());
-        ExtensionTreatment arpShaToTha = resolver
-                .getExtensionInstruction(ExtensionTreatmentType.ExtensionTreatmentTypes
-                                         .NICIRA_MOV_ARP_SHA_TO_THA.type());
-        ExtensionTreatment arpSpaToTpa = resolver
-                .getExtensionInstruction(ExtensionTreatmentType.ExtensionTreatmentTypes
-                                         .NICIRA_MOV_ARP_SPA_TO_TPA.type());
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .extension(ethSrcToDst, deviceId)
-                .setEthSrc(dstMac).setArpOp(ARP_RESPONSE)
-                .extension(arpShaToTha, deviceId)
-                .extension(arpSpaToTpa, deviceId)
-                .setArpSha(dstMac).setArpSpa(dstIP)
-                .setOutput(PortNumber.IN_PORT).build();
-
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment).withSelector(selector)
-                .fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(ARP_PRIORITY);
-
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("PrivateArpRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("PrivateArpRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java
deleted file mode 100644
index 512a1559..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/ClassifierServiceImpl.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.EthType.EtherType;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.criteria.Criteria;
-import org.onosproject.net.flow.instructions.Instructions;
-import org.onosproject.net.flowobjective.DefaultForwardingObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtn.table.ClassifierService;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.slf4j.Logger;
-
-import com.google.common.collect.Sets;
-
-/**
- * Provides implementation of ClassifierService.
- */
-public class ClassifierServiceImpl implements ClassifierService {
-    private final Logger log = getLogger(getClass());
-
-    private static final EtherType ETH_TYPE = EtherType.ARP;
-    private static final int ARP_CLASSIFIER_PRIORITY = 60000;
-    private static final int L3_CLASSIFIER_PRIORITY = 0xffff;
-    private static final int L2_CLASSIFIER_PRIORITY = 50000;
-
-    private final FlowObjectiveService flowObjectiveService;
-    private final ApplicationId appId;
-
-    /**
-     * Constructor.
-     *
-     * @param appId the application id of vtn
-     */
-    public ClassifierServiceImpl(ApplicationId appId) {
-        this.appId = checkNotNull(appId, "ApplicationId can not be null");
-        ServiceDirectory serviceDirectory = new DefaultServiceDirectory();
-        this.flowObjectiveService = serviceDirectory.get(FlowObjectiveService.class);
-    }
-
-    @Override
-    public void programLocalIn(DeviceId deviceId,
-                               SegmentationId segmentationId, PortNumber inPort,
-                               MacAddress srcMac, ApplicationId appid,
-                               Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchInPort(inPort).matchEthSrc(srcMac).build();
-        TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
-        treatment.add(Instructions
-                .modTunnelId(Long.parseLong(segmentationId.toString())));
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment.build())
-                .withSelector(selector).fromApp(appId).makePermanent()
-                .withFlag(Flag.SPECIFIC).withPriority(L2_CLASSIFIER_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("programLocalIn-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("programLocalIn-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-
-    @Override
-    public void programTunnelIn(DeviceId deviceId,
-                                SegmentationId segmentationId,
-                                Iterable<PortNumber> localTunnelPorts,
-                                Objective.Operation type) {
-        if (localTunnelPorts == null) {
-            log.info("No tunnel port in device");
-            return;
-        }
-        Sets.newHashSet(localTunnelPorts).stream().forEach(tp -> {
-            TrafficSelector selector = DefaultTrafficSelector.builder()
-                    .matchInPort(tp).add(Criteria.matchTunnelId(Long
-                            .parseLong(segmentationId.toString())))
-                    .build();
-
-            TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                    .build();
-            ForwardingObjective.Builder objective = DefaultForwardingObjective
-                    .builder().withTreatment(treatment).withSelector(selector)
-                    .fromApp(appId).makePermanent().withFlag(Flag.SPECIFIC)
-                    .withPriority(L2_CLASSIFIER_PRIORITY);
-            if (type.equals(Objective.Operation.ADD)) {
-                log.debug("programTunnelIn-->ADD");
-                flowObjectiveService.forward(deviceId, objective.add());
-            } else {
-                log.debug("programTunnelIn-->REMOVE");
-                flowObjectiveService.forward(deviceId, objective.remove());
-            }
-        });
-    }
-
-    @Override
-    public void programL3ExPortClassifierRules(DeviceId deviceId, PortNumber inPort,
-                                               IpAddress dstIp,
-                                               Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_IPV4).matchInPort(inPort)
-                .matchIPDst(IpPrefix.valueOf(dstIp, 32)).build();
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment).withSelector(selector)
-                .fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(L3_CLASSIFIER_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("L3ExToInClassifierRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("L3ExToInClassifierRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-
-    @Override
-    public void programL3InPortClassifierRules(DeviceId deviceId, PortNumber inPort,
-                                               MacAddress srcMac, MacAddress dstMac,
-                                               SegmentationId actionVni,
-                                               Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchInPort(inPort).matchEthSrc(srcMac).matchEthDst(dstMac)
-                .build();
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setTunnelId(Long.parseLong(actionVni.segmentationId())).build();
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment).withSelector(selector)
-                .fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(L3_CLASSIFIER_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("L3InternalClassifierRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("L3InternalClassifierRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-
-    @Override
-    public void programArpClassifierRules(DeviceId deviceId, IpAddress dstIp,
-                                          SegmentationId actionVni,
-                                          Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(ETH_TYPE.ethType().toShort())
-                .matchArpTpa(Ip4Address.valueOf(dstIp.toString()))
-                .build();
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setTunnelId(Long.parseLong(actionVni.segmentationId()))
-                .build();
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment).withSelector(selector)
-                .fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(ARP_CLASSIFIER_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("ArpClassifierRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("ArpClassifierRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/DnatServiceImpl.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/DnatServiceImpl.java
deleted file mode 100644
index 7b8d42fa..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/DnatServiceImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flowobjective.DefaultForwardingObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtn.table.DnatService;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.slf4j.Logger;
-
-/**
- * Provides implementation of DnatService.
- */
-public class DnatServiceImpl implements DnatService {
-    private final Logger log = getLogger(getClass());
-
-    private static final int DNAT_PRIORITY = 0xffff;
-    private static final int PREFIX_LENGTH = 32;
-
-    private final FlowObjectiveService flowObjectiveService;
-    private final ApplicationId appId;
-
-    /**
-     * Construct a DnatServiceImpl object.
-     *
-     * @param appId the application id of vtn
-     */
-    public DnatServiceImpl(ApplicationId appId) {
-        this.appId = checkNotNull(appId, "ApplicationId can not be null");
-        ServiceDirectory serviceDirectory = new DefaultServiceDirectory();
-        this.flowObjectiveService = serviceDirectory.get(FlowObjectiveService.class);
-    }
-
-    @Override
-    public void programRules(DeviceId deviceId, IpAddress dstIp,
-                             MacAddress ethSrc, IpAddress ipDst,
-                             SegmentationId actionVni, Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_IPV4)
-                .matchIPDst(IpPrefix.valueOf(dstIp, PREFIX_LENGTH)).build();
-
-        TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
-        treatment.setEthSrc(ethSrc).setIpDst(ipDst)
-                .setTunnelId(Long.parseLong(actionVni.segmentationId()));
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment.build())
-                .withSelector(selector).fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(DNAT_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("RouteRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("RouteRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
deleted file mode 100644
index 3581cf6e..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L2ForwardServiceImpl.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_TUNNEL_DST;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.Ip4Address;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.DefaultGroupId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
-import org.onosproject.net.driver.DriverHandler;
-import org.onosproject.net.driver.DriverService;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.TrafficTreatment.Builder;
-import org.onosproject.net.flow.criteria.Criteria;
-import org.onosproject.net.flow.instructions.ExtensionTreatment;
-import org.onosproject.net.flowobjective.DefaultForwardingObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtn.table.L2ForwardService;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.slf4j.Logger;
-
-import com.google.common.collect.Sets;
-
-/**
- * Provides implementation of L2ForwardService.
- */
-public final class L2ForwardServiceImpl implements L2ForwardService {
-    private final Logger log = getLogger(getClass());
-
-    private static final int MAC_PRIORITY = 0xffff;
-    public static final Integer GROUP_ID = 1;
-    private final FlowObjectiveService flowObjectiveService;
-    private final ApplicationId appId;
-    private final DriverService driverService;
-    /**
-     * Constructor.
-     *
-     * @param appId the application id of vtn
-     */
-    public L2ForwardServiceImpl(ApplicationId appId) {
-        this.appId = checkNotNull(appId, "ApplicationId can not be null");
-        ServiceDirectory serviceDirectory = new DefaultServiceDirectory();
-        this.flowObjectiveService = serviceDirectory.get(FlowObjectiveService.class);
-        this.driverService = serviceDirectory.get(DriverService.class);
-    }
-
-    @Override
-    public void programLocalBcastRules(DeviceId deviceId,
-                                       SegmentationId segmentationId,
-                                       PortNumber inPort,
-                                       Iterable<PortNumber> localVmPorts,
-                                       Iterable<PortNumber> localTunnelPorts,
-                                       Objective.Operation type) {
-        if (localVmPorts == null || localTunnelPorts == null) {
-            log.info("No other host port and tunnel in the device");
-            return;
-        }
-        Sets.newHashSet(localVmPorts).stream().forEach(lp -> {
-            TrafficSelector selector = DefaultTrafficSelector.builder()
-                    .matchInPort(lp).matchEthDst(MacAddress.BROADCAST)
-                    .add(Criteria.matchTunnelId(Long
-                            .parseLong(segmentationId.toString())))
-                    .build();
-            TrafficTreatment.Builder treatment = DefaultTrafficTreatment
-                    .builder();
-            boolean flag = false;
-            for (PortNumber outPort : localVmPorts) {
-                flag = true;
-                if (outPort != lp) {
-                    treatment.setOutput(outPort);
-                }
-            }
-            if (type.equals(Objective.Operation.REMOVE) && inPort == lp) {
-                flag = false;
-            }
-            treatment.group(new DefaultGroupId(GROUP_ID));
-            ForwardingObjective.Builder objective = DefaultForwardingObjective
-                    .builder().withTreatment(treatment.build())
-                    .withSelector(selector).fromApp(appId).makePermanent()
-                    .withFlag(Flag.SPECIFIC).withPriority(MAC_PRIORITY);
-            if (flag) {
-                flowObjectiveService.forward(deviceId, objective.add());
-            } else {
-                flowObjectiveService.forward(deviceId, objective.remove());
-            }
-        });
-    }
-
-    @Override
-    public void programTunnelBcastRules(DeviceId deviceId,
-                                        SegmentationId segmentationId,
-                                        Iterable<PortNumber> localVmPorts,
-                                        Iterable<PortNumber> localTunnelPorts,
-                                        Objective.Operation type) {
-        if (localVmPorts == null || localTunnelPorts == null) {
-            log.info("No other host port or tunnel ports in the device");
-            return;
-        }
-        Sets.newHashSet(localTunnelPorts).stream().forEach(tp -> {
-            TrafficSelector selector = DefaultTrafficSelector.builder()
-                    .matchInPort(tp)
-                    .add(Criteria.matchTunnelId(Long
-                            .parseLong(segmentationId.toString())))
-                    .matchEthDst(MacAddress.BROADCAST).build();
-            TrafficTreatment.Builder treatment = DefaultTrafficTreatment
-                    .builder();
-
-            for (PortNumber outPort : localVmPorts) {
-                treatment.setOutput(outPort);
-            }
-
-            ForwardingObjective.Builder objective = DefaultForwardingObjective
-                    .builder().withTreatment(treatment.build())
-                    .withSelector(selector).fromApp(appId).makePermanent()
-                    .withFlag(Flag.SPECIFIC).withPriority(MAC_PRIORITY);
-            if (type.equals(Objective.Operation.ADD)) {
-                if (Sets.newHashSet(localVmPorts).size() == 0) {
-                    flowObjectiveService.forward(deviceId, objective.remove());
-                } else {
-                    flowObjectiveService.forward(deviceId, objective.add());
-                }
-            } else {
-                flowObjectiveService.forward(deviceId, objective.remove());
-            }
-        });
-    }
-
-    @Override
-    public void programLocalOut(DeviceId deviceId,
-                                SegmentationId segmentationId,
-                                PortNumber outPort, MacAddress sourceMac,
-                                Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchTunnelId(Long.parseLong(segmentationId.toString()))
-                .matchEthDst(sourceMac).build();
-        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setOutput(outPort).build();
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment).withSelector(selector)
-                .fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(MAC_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-
-    }
-
-    @Override
-    public void programTunnelOut(DeviceId deviceId,
-                                 SegmentationId segmentationId,
-                                 PortNumber tunnelOutPort, MacAddress dstMac,
-                                 Objective.Operation type, IpAddress ipAddress) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthDst(dstMac).add(Criteria.matchTunnelId(Long
-                        .parseLong(segmentationId.toString())))
-                .build();
-
-        DriverHandler handler = driverService.createHandler(deviceId);
-        ExtensionTreatmentResolver resolver =  handler.behaviour(ExtensionTreatmentResolver.class);
-        ExtensionTreatment treatment = resolver.getExtensionInstruction(NICIRA_SET_TUNNEL_DST.type());
-        try {
-            treatment.setPropertyValue("tunnelDst", Ip4Address.valueOf(ipAddress.toString()));
-        } catch (Exception e) {
-           log.error("Failed to get extension instruction to set tunnel dst {}", deviceId);
-        }
-
-        Builder builder = DefaultTrafficTreatment.builder();
-        builder.extension(treatment, deviceId)
-                .setOutput(tunnelOutPort).build();
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(builder.build()).withSelector(selector)
-                .fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(MAC_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-
-    }
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L3ForwardServiceImpl.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L3ForwardServiceImpl.java
deleted file mode 100644
index cf97e76d..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/L3ForwardServiceImpl.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flow.instructions.Instructions;
-import org.onosproject.net.flowobjective.DefaultForwardingObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.net.flowobjective.Objective.Operation;
-import org.onosproject.vtn.table.L3ForwardService;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.slf4j.Logger;
-
-/**
- * Provides implementation of L3ForwardService.
- */
-public class L3ForwardServiceImpl implements L3ForwardService {
-    private final Logger log = getLogger(getClass());
-
-    private static final int L3FWD_PRIORITY = 0xffff;
-    private static final short IP_TYPE = Ethernet.TYPE_IPV4;
-    private static final int PREFIX_LENGTH = 32;
-
-    private final FlowObjectiveService flowObjectiveService;
-    private final ApplicationId appId;
-
-    /**
-     * Construct a L3ForwardServiceImpl object.
-     *
-     * @param appId the application id of vtn
-     */
-    public L3ForwardServiceImpl(ApplicationId appId) {
-        this.appId = checkNotNull(appId, "ApplicationId can not be null");
-        ServiceDirectory serviceDirectory = new DefaultServiceDirectory();
-        this.flowObjectiveService = serviceDirectory.get(FlowObjectiveService.class);
-    }
-
-    @Override
-    public void programRouteRules(DeviceId deviceId, SegmentationId l3Vni,
-                                  IpAddress dstVmIP, SegmentationId dstVni,
-                                  MacAddress dstVmGwMac, MacAddress dstVmMac,
-                                  Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(IP_TYPE)
-                .matchTunnelId(Long.parseLong(l3Vni.segmentationId()))
-                .matchIPDst(IpPrefix.valueOf(dstVmIP, PREFIX_LENGTH)).build();
-        TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
-        treatment.setEthSrc(dstVmGwMac)
-                .setEthDst(dstVmMac)
-                .add(Instructions.modTunnelId(Long.parseLong(dstVni
-                             .segmentationId())));
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment.build())
-                .withSelector(selector).fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(L3FWD_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("RouteRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("RouteRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/SnatServiceImpl.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/SnatServiceImpl.java
deleted file mode 100644
index 0f090954..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/SnatServiceImpl.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.table.impl;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import org.onlab.osgi.DefaultServiceDirectory;
-import org.onlab.osgi.ServiceDirectory;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.IpPrefix;
-import org.onlab.packet.MacAddress;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
-import org.onosproject.net.flowobjective.DefaultForwardingObjective;
-import org.onosproject.net.flowobjective.FlowObjectiveService;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.net.flowobjective.Objective;
-import org.onosproject.vtn.table.SnatService;
-import org.onosproject.vtnrsc.SegmentationId;
-import org.slf4j.Logger;
-
-/**
- * Provides implementation of SnatService.
- */
-public class SnatServiceImpl implements SnatService {
-    private final Logger log = getLogger(getClass());
-
-    private static final int SNAT_PRIORITY = 0xffff;
-    private static final int PREFIC_LENGTH = 32;
-
-    private final FlowObjectiveService flowObjectiveService;
-    private final ApplicationId appId;
-
-    /**
-     * Construct a SnatServiceImpl object.
-     *
-     * @param appId the application id of vtn
-     */
-    public SnatServiceImpl(ApplicationId appId) {
-        this.appId = checkNotNull(appId, "ApplicationId can not be null");
-        ServiceDirectory serviceDirectory = new DefaultServiceDirectory();
-        this.flowObjectiveService = serviceDirectory.get(FlowObjectiveService.class);
-    }
-
-    @Override
-    public void programRules(DeviceId deviceId, SegmentationId matchVni,
-                             IpAddress srcIP, MacAddress ethDst,
-                             MacAddress ethSrc, IpAddress ipSrc,
-                             SegmentationId actionVni, Objective.Operation type) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthType(Ethernet.TYPE_IPV4)
-                .matchTunnelId(Long.parseLong(matchVni.segmentationId()))
-                .matchIPSrc(IpPrefix.valueOf(srcIP, PREFIC_LENGTH)).build();
-
-        TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
-        treatment.setEthDst(ethDst).setEthSrc(ethSrc).setIpSrc(ipSrc)
-                .setTunnelId(Long.parseLong(actionVni.segmentationId()));
-        ForwardingObjective.Builder objective = DefaultForwardingObjective
-                .builder().withTreatment(treatment.build())
-                .withSelector(selector).fromApp(appId).withFlag(Flag.SPECIFIC)
-                .withPriority(SNAT_PRIORITY);
-        if (type.equals(Objective.Operation.ADD)) {
-            log.debug("RouteRules-->ADD");
-            flowObjectiveService.forward(deviceId, objective.add());
-        } else {
-            log.debug("RouteRules-->REMOVE");
-            flowObjectiveService.forward(deviceId, objective.remove());
-        }
-    }
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/package-info.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/package-info.java
deleted file mode 100644
index fd2e18e5..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/impl/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * VTN application that applies configuration and flows to the device.
- */
-package org.onosproject.vtn.table.impl;
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/package-info.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/package-info.java
deleted file mode 100644
index cf53c966..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/table/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * VTN application that applies configuration and flows to the device.
- */
-package org.onosproject.vtn.table;
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/DataPathIdGenerator.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/DataPathIdGenerator.java
deleted file mode 100644
index c2413475..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/DataPathIdGenerator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.onosproject.vtn.util;
-
-import static org.onlab.util.Tools.toHex;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Calendar;
-
-import org.onosproject.core.IdGenerator;
-import org.onosproject.net.DeviceId;
-
-public final class DataPathIdGenerator implements IdGenerator {
-    private static final String SCHEME = "of";
-    private String ipAddress;
-    private String timeStamp;
-
-    private DataPathIdGenerator(Builder builder) {
-        this.ipAddress = builder.ipAddress;
-        Calendar cal = Calendar.getInstance();
-        this.timeStamp = String.valueOf(cal.get(Calendar.SECOND))
-                + String.valueOf(cal.get(Calendar.MILLISECOND));
-    }
-
-    @Override
-    public long getNewId() {
-        String dpid = ipAddress.replace(".", "") + timeStamp;
-        return Long.parseLong(dpid);
-    }
-
-    public String getDpId() {
-        return toHex(getNewId());
-    }
-
-    public DeviceId getDeviceId() {
-        try {
-            URI uri = new URI(SCHEME, toHex(getNewId()), null);
-            return DeviceId.deviceId(uri);
-        } catch (URISyntaxException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns a new builder.
-     *
-     * @return new builder
-     */
-    public static Builder builder() {
-        return new Builder();
-    }
-
-    public static final class Builder {
-        private String ipAddress;
-
-        public Builder addIpAddress(String ipAddress) {
-            this.ipAddress = ipAddress;
-            return this;
-        }
-
-        public DataPathIdGenerator build() {
-            return new DataPathIdGenerator(this);
-        }
-    }
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnConfig.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnConfig.java
deleted file mode 100644
index 5ac04661..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnConfig.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.onlab.packet.IpAddress;
-import org.onosproject.net.DefaultAnnotations;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.behaviour.BridgeConfig;
-import org.onosproject.net.behaviour.BridgeName;
-import org.onosproject.net.behaviour.DefaultTunnelDescription;
-import org.onosproject.net.behaviour.IpTunnelEndPoint;
-import org.onosproject.net.behaviour.TunnelConfig;
-import org.onosproject.net.behaviour.TunnelDescription;
-import org.onosproject.net.behaviour.TunnelEndPoint;
-import org.onosproject.net.behaviour.TunnelName;
-import org.onosproject.net.driver.DriverHandler;
-
-/**
- * Applies configuration to the device.
- */
-public final class VtnConfig {
-
-    private static final String DEFAULT_BRIDGE_NAME = "br-int";
-    private static final String DEFAULT_TUNNEL = "vxlan-0.0.0.0";
-    private static final Map<String, String> DEFAULT_TUNNEL_OPTIONS = new HashMap<String, String>() {
-        {
-            put("key", "flow");
-            put("remote_ip", "flow");
-        }
-    };
-    /**
-     * Constructs a vtn config object. Utility classes should not have a
-     * public or default constructor, otherwise IDE will compile unsuccessfully. This
-     * class should not be instantiated.
-     */
-    private VtnConfig() {
-    }
-
-    /**
-     * Creates or update bridge in the controller device.
-     *
-     * @param handler DriverHandler
-     * @param dpid datapath id
-     * @param exPortName external port name
-     */
-    public static void applyBridgeConfig(DriverHandler handler, String dpid, String exPortName) {
-        BridgeConfig bridgeConfig = handler.behaviour(BridgeConfig.class);
-        bridgeConfig.addBridge(BridgeName.bridgeName(DEFAULT_BRIDGE_NAME), dpid, exPortName);
-    }
-
-    /**
-     * Creates or update tunnel in the controller device.
-     *
-     * @param handler DriverHandler
-     * @param srcIp the ipAddress of the local controller device
-     * @param dstIp the ipAddress of the remote controller device
-     */
-    public static void applyTunnelConfig(DriverHandler handler, IpAddress srcIp,
-                                  IpAddress dstIp) {
-        DefaultAnnotations.Builder optionBuilder = DefaultAnnotations.builder();
-        for (String key : DEFAULT_TUNNEL_OPTIONS.keySet()) {
-            optionBuilder.set(key, DEFAULT_TUNNEL_OPTIONS.get(key));
-        }
-        TunnelConfig tunnelConfig = handler.behaviour(TunnelConfig.class);
-        TunnelEndPoint tunnelAsSrc = IpTunnelEndPoint.ipTunnelPoint(srcIp);
-        TunnelDescription tunnel = new DefaultTunnelDescription(
-                                                                tunnelAsSrc,
-                                                                null,
-                                                                TunnelDescription.Type.VXLAN,
-                                                                TunnelName.tunnelName(DEFAULT_TUNNEL),
-                                                                optionBuilder.build());
-        tunnelConfig.createTunnelInterface(BridgeName.bridgeName(DEFAULT_BRIDGE_NAME), tunnel);
-    }
-
-    /**
-     * Creates or update tunnel in the controller device.
-     *
-     * @param handler DriverHandler
-     * @param srcIp the ipAddress of the local controller device
-     * @param dstIp the ipAddress of the remote controller device
-     */
-    public static void removeTunnelConfig(DriverHandler handler, IpAddress srcIp,
-                                   IpAddress dstIp) {
-        TunnelConfig tunnelConfig = handler.behaviour(TunnelConfig.class);
-        TunnelEndPoint tunnelAsSrc = IpTunnelEndPoint.ipTunnelPoint(srcIp);
-        TunnelEndPoint tunnelAsDst = IpTunnelEndPoint.ipTunnelPoint(dstIp);
-        TunnelDescription tunnel = new DefaultTunnelDescription(
-                                                                tunnelAsSrc,
-                                                                tunnelAsDst,
-                                                                TunnelDescription.Type.VXLAN,
-                                                                null);
-        tunnelConfig.removeTunnel(tunnel);
-    }
-
-    /**
-     * Gets ports in the controller device.
-     *
-     * @param handler DriverHandler
-     * @return set of port numbers
-     */
-    public static Set<PortNumber> getPortNumbers(DriverHandler handler) {
-        BridgeConfig bridgeConfig = handler.behaviour(BridgeConfig.class);
-        return bridgeConfig.getPortNumbers();
-    }
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java
deleted file mode 100644
index cca905c2..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/VtnData.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.vtn.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.onlab.packet.IpAddress;
-import org.onosproject.net.AnnotationKeys;
-import org.onosproject.net.Device;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.Port;
-import org.onosproject.net.PortNumber;
-import org.onosproject.store.service.EventuallyConsistentMap;
-import org.onosproject.vtnrsc.FixedIp;
-import org.onosproject.vtnrsc.TenantNetworkId;
-import org.onosproject.vtnrsc.VirtualPort;
-import org.onosproject.vtnrsc.VirtualPortId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Sets;
-
-/**
- * VtnData utility class.
- */
-public final class VtnData {
-
-    private static final Logger log = LoggerFactory.getLogger(VtnData.class);
-    private static final String SWITCH_CHANNEL_ID = "channelId";
-    private static final String PORT_HEAD = "vxlan";
-
-    /**
-     * Constructs a VtnData object. Utility classes should not have a public or
-     * default constructor, otherwise IDE will compile unsuccessfully. This
-     * class should not be instantiated.
-     */
-    private VtnData() {
-    }
-
-    /**
-     * Get the ControllerIp from the device .
-     *
-     * @param device Device
-     * @return Controller Ip
-     */
-    public static String getControllerIpOfSwitch(Device device) {
-        String url = device.annotations().value(SWITCH_CHANNEL_ID);
-        return url.substring(0, url.lastIndexOf(":"));
-    }
-
-    /**
-     * Get the ControllerId from the device .
-     *
-     * @param device Device
-     * @param devices Devices
-     * @return Controller Id
-     */
-    public static DeviceId getControllerId(Device device,
-                                           Iterable<Device> devices) {
-        for (Device d : devices) {
-            if (d.type() == Device.Type.CONTROLLER && d.id().toString()
-                    .contains(getControllerIpOfSwitch(device))) {
-                return d.id();
-            }
-        }
-        log.info("Can not find controller for device : {}", device.id());
-        return null;
-    }
-
-    /**
-     * Get local tunnel ports.
-     *
-     * @param ports Iterable of Port
-     * @return Collection of PortNumber
-     */
-    public static Collection<PortNumber> getLocalTunnelPorts(Iterable<Port> ports) {
-        Collection<PortNumber> localTunnelPorts = new ArrayList<>();
-        Sets.newHashSet(ports).stream()
-                .filter(p -> !p.number().equals(PortNumber.LOCAL))
-                .forEach(p -> {
-                    if (p.annotations().value(AnnotationKeys.PORT_NAME)
-                            .startsWith(PORT_HEAD)) {
-                        localTunnelPorts.add(p.number());
-                    }
-                });
-        return localTunnelPorts;
-    }
-
-    /**
-     * Get VirtualPort.
-     *
-     * @param vPortStore EventuallyConsistentMap of VirtualPort
-     * @param vPortId VirtualPortId of the VirtualPort
-     * @return VirtualPort
-     */
-    public static VirtualPort getPort(EventuallyConsistentMap<VirtualPortId, VirtualPort> vPortStore,
-                                      VirtualPortId vPortId) {
-        if (vPortStore != null) {
-            return vPortStore.get(vPortId);
-        }
-        return null;
-    }
-
-    /**
-     * Get VirtualPort.
-     *
-     * @param vPortStore EventuallyConsistentMap of VirtualPort
-     * @param fixedIP FixedIp of the VirtualPort
-     * @return VirtualPort
-     */
-    public static VirtualPort getPort(EventuallyConsistentMap<VirtualPortId, VirtualPort> vPortStore,
-                                      FixedIp fixedIP) {
-        if (vPortStore != null) {
-            List<VirtualPort> vPorts = new ArrayList<>();
-            vPortStore.values().stream().forEach(p -> {
-                Iterator<FixedIp> fixedIps = p.fixedIps().iterator();
-                while (fixedIps.hasNext()) {
-                    if (fixedIps.next().equals(fixedIP)) {
-                        vPorts.add(p);
-                        break;
-                    }
-                }
-            });
-            if (vPorts.size() == 0) {
-                return null;
-            }
-            return vPorts.get(0);
-        }
-        return null;
-    }
-
-    /**
-     * Get VirtualPort.
-     *
-     * @param vPortStore EventuallyConsistentMap of VirtualPort
-     * @param networkId TenantNetworkId of the VirtualPort
-     * @param ip IpAddress of the VirtualPort
-     * @return VirtualPort
-     */
-    public static VirtualPort getPort(EventuallyConsistentMap<VirtualPortId, VirtualPort> vPortStore,
-                                      TenantNetworkId networkId, IpAddress ip) {
-        if (vPortStore != null) {
-            List<VirtualPort> vPorts = new ArrayList<>();
-            vPortStore.values().stream()
-                    .filter(p -> p.networkId().equals(networkId))
-                    .forEach(p -> {
-                        Iterator<FixedIp> fixedIps = p.fixedIps().iterator();
-                        while (fixedIps.hasNext()) {
-                            if (fixedIps.next().ip().equals(ip)) {
-                                vPorts.add(p);
-                                break;
-                            }
-                        }
-                    });
-            if (vPorts.size() == 0) {
-                return null;
-            }
-            return vPorts.get(0);
-        }
-        return null;
-    }
-
-}
diff --git a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/package-info.java b/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/package-info.java
deleted file mode 100644
index 213b9e28..00000000
--- a/framework/src/onos/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/util/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * VTN application that applies configuration and flows to the device.
- */
-package org.onosproject.vtn.util;