Remove deprecated openflow host and link providers

Change-Id: I9dbaa28a70998b6265a178bb459a56221f458b75

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014 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 xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-of-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-of-provider-host</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS OpenFlow protocol host provider</description>
-
-</project>

-/*
- * Copyright 2014 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.provider.of.host.impl;
-
-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.onlab.packet.ARP;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.IPv4;
-import org.onlab.packet.IpAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.Host;
-import org.onosproject.net.HostId;
-import org.onosproject.net.HostLocation;
-import org.onosproject.net.host.DefaultHostDescription;
-import org.onosproject.net.host.HostDescription;
-import org.onosproject.net.host.HostProvider;
-import org.onosproject.net.host.HostProviderRegistry;
-import org.onosproject.net.host.HostProviderService;
-import org.onosproject.net.provider.AbstractProvider;
-import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.topology.Topology;
-import org.onosproject.net.topology.TopologyService;
-import org.onosproject.openflow.controller.Dpid;
-import org.onosproject.openflow.controller.OpenFlowController;
-import org.onosproject.openflow.controller.OpenFlowPacketContext;
-import org.onosproject.openflow.controller.PacketListener;
-import org.slf4j.Logger;
-
-import static org.onosproject.net.DeviceId.deviceId;
-import static org.onosproject.net.PortNumber.portNumber;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Provider which uses an OpenFlow controller to detect network
- * end-station hosts.
- */
-@Component(immediate = true)
-@Deprecated
-public class OpenFlowHostProvider extends AbstractProvider implements HostProvider {
-
-    private final Logger log = getLogger(getClass());
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected HostProviderRegistry providerRegistry;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenFlowController controller;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected TopologyService topologyService;
-
-    private HostProviderService providerService;
-
-    private final InternalHostProvider listener = new InternalHostProvider();
-
-    private boolean ipLearn = true;
-
-    /**
-     * Creates an OpenFlow host provider.
-     */
-    public OpenFlowHostProvider() {
-        super(new ProviderId("of", "org.onosproject.provider.openflow"));
-    }
-
-    @Activate
-    public void activate() {
-        providerService = providerRegistry.register(this);
-        controller.addPacketListener(10, listener);
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        providerRegistry.unregister(this);
-        controller.removePacketListener(listener);
-        providerService = null;
-        log.info("Stopped");
-    }
-
-    @Override
-    public void triggerProbe(Host host) {
-        log.info("Triggering probe on device {}", host);
-    }
-
-    private class InternalHostProvider implements PacketListener {
-
-        @Override
-        public void handlePacket(OpenFlowPacketContext pktCtx) {
-            Ethernet eth = pktCtx.parsed();
-
-            if (eth == null) {
-                return;
-            }
-
-            VlanId vlan = VlanId.vlanId(eth.getVlanID());
-            ConnectPoint heardOn = new ConnectPoint(deviceId(Dpid.uri(pktCtx.dpid())),
-                                                    portNumber(pktCtx.inPort()));
-
-            // If this is not an edge port, bail out.
-            Topology topology = topologyService.currentTopology();
-            if (topologyService.isInfrastructure(topology, heardOn)) {
-                return;
-            }
-
-            HostLocation hloc = new HostLocation(deviceId(Dpid.uri(pktCtx.dpid())),
-                                                 portNumber(pktCtx.inPort()),
-                                                 System.currentTimeMillis());
-
-            HostId hid = HostId.hostId(eth.getSourceMAC(), vlan);
-
-            // Potentially a new or moved host
-            if (eth.getEtherType() == Ethernet.TYPE_ARP) {
-                ARP arp = (ARP) eth.getPayload();
-                IpAddress ip =
-                    IpAddress.valueOf(IpAddress.Version.INET,
-                                      arp.getSenderProtocolAddress());
-                HostDescription hdescr =
-                        new DefaultHostDescription(eth.getSourceMAC(), vlan, hloc, ip);
-                providerService.hostDetected(hid, hdescr);
-
-            } else if (ipLearn && eth.getEtherType() == Ethernet.TYPE_IPV4) {
-                IPv4 pip = (IPv4) eth.getPayload();
-                IpAddress ip =
-                    IpAddress.valueOf(pip.getSourceAddress());
-                HostDescription hdescr =
-                        new DefaultHostDescription(eth.getSourceMAC(), vlan, hloc, ip);
-                providerService.hostDetected(hid, hdescr);
-
-            }
-
-        }
-
-    }
-}

-/*
- * Copyright 2014 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.
- */
-
-/**
- * Provider that uses OpenFlow controller as a means of host discovery and tracking.
- */
-package org.onosproject.provider.of.host.impl;

-/*
- * Copyright 2014 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.provider.of.host.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.HostId;
-import org.onosproject.net.host.HostDescription;
-import org.onosproject.net.host.HostProvider;
-import org.onosproject.net.host.HostProviderRegistry;
-import org.onosproject.net.host.HostProviderService;
-import org.onosproject.net.provider.AbstractProviderService;
-import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.topology.Topology;
-import org.onosproject.net.topology.TopologyServiceAdapter;
-import org.onosproject.openflow.controller.Dpid;
-import org.onosproject.openflow.controller.OpenFlowPacketContext;
-import org.onosproject.openflow.controller.OpenflowControllerAdapter;
-import org.onosproject.openflow.controller.PacketListener;
-import org.onlab.packet.ARP;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.VlanId;
-import org.projectfloodlight.openflow.protocol.OFMessage;
-import org.projectfloodlight.openflow.types.OFPort;
-
-public class OpenFlowHostProviderTest {
-
-    private static final Integer INPORT = 10;
-    private static final Dpid DPID1 = new Dpid(100);
-    private static final Dpid DPID2 = new Dpid(200);
-    private static final Dpid DPID3 = new Dpid(300);
-
-    private static final VlanId VLAN = VlanId.vlanId();
-    private static final MacAddress MAC = MacAddress.valueOf("00:00:11:00:00:01");
-    private static final MacAddress BCMAC = MacAddress.valueOf("ff:ff:ff:ff:ff:ff");
-    private static final byte[] IP = new byte[]{10, 0, 0, 1};
-
-    private final OpenFlowHostProvider provider = new OpenFlowHostProvider();
-    private final TestHostRegistry hostService = new TestHostRegistry();
-    private final TestController controller = new TestController();
-    private final TestTopologyService topoService = new TestTopologyService();
-    private TestHostProviderService providerService;
-
-    @Before
-    public void setUp() {
-        provider.providerRegistry = hostService;
-        provider.controller = controller;
-        provider.topologyService = topoService;
-        provider.activate();
-    }
-
-    @Test
-    public void basics() {
-        assertNotNull("registration expected", providerService);
-        assertEquals("incorrect provider", provider, providerService.provider());
-    }
-
-    @Test
-    public void events() {
-        // new host
-        controller.processPacket(DPID1, null);
-        assertNotNull("new host expected", providerService.added);
-        assertNull("host motion unexpected", providerService.moved);
-
-        // the host moved to new switch
-        controller.processPacket(DPID2, null);
-        assertNotNull("host motion expected", providerService.moved);
-
-        // the host was misheard on a spine
-        controller.processPacket(DPID3, null);
-        assertNull("host misheard on spine switch", providerService.spine);
-    }
-
-    @After
-    public void tearDown() {
-        provider.deactivate();
-        provider.providerRegistry = null;
-        provider.controller = null;
-    }
-
-    private class TestHostRegistry implements HostProviderRegistry {
-
-        @Override
-        public HostProviderService register(HostProvider provider) {
-            providerService = new TestHostProviderService(provider);
-            return providerService;
-        }
-
-        @Override
-        public void unregister(HostProvider provider) {
-        }
-
-        @Override
-        public Set<ProviderId> getProviders() {
-            return null;
-        }
-
-    }
-
-    private class TestHostProviderService
-    extends AbstractProviderService<HostProvider>
-    implements HostProviderService {
-
-        Dpid added = null;
-        Dpid moved = null;
-        Dpid spine = null;
-
-        protected TestHostProviderService(HostProvider provider) {
-            super(provider);
-        }
-
-        @Override
-        public void hostDetected(HostId hostId, HostDescription hostDescription) {
-            Dpid descr = Dpid.dpid(hostDescription.location().deviceId().uri());
-            if (added == null) {
-                added = descr;
-            } else if ((moved == null) && !descr.equals(added)) {
-                moved = descr;
-            } else {
-                spine = descr;
-            }
-        }
-
-        @Override
-        public void hostVanished(HostId hostId) {
-        }
-
-    }
-
-    private class TestController extends OpenflowControllerAdapter {
-        PacketListener pktListener;
-
-        @Override
-        public void addPacketListener(int priority, PacketListener listener) {
-            pktListener = listener;
-        }
-
-        @Override
-        public void processPacket(Dpid dpid, OFMessage msg) {
-            OpenFlowPacketContext ctx = new TestPacketContext(dpid);
-            pktListener.handlePacket(ctx);
-        }
-    }
-
-    private class TestTopologyService extends TopologyServiceAdapter {
-        @Override
-        public boolean isInfrastructure(Topology topology,
-                ConnectPoint connectPoint) {
-            //simulate DPID3 as an infrastructure switch
-            if (Dpid.dpid(connectPoint.deviceId().uri()).equals(DPID3)) {
-                return true;
-            }
-            return false;
-        }
-    }
-
-    private class TestPacketContext implements OpenFlowPacketContext {
-
-        protected Dpid swid;
-
-        public TestPacketContext(Dpid dpid) {
-            swid = dpid;
-        }
-
-        @Override
-        public boolean block() {
-            return false;
-        }
-
-        @Override
-        public void send() {
-        }
-
-        @Override
-        public void build(OFPort outPort) {
-        }
-
-        @Override
-        public void build(Ethernet ethFrame, OFPort outPort) {
-        }
-
-        @Override
-        public Ethernet parsed() {
-            // just things we (and serializers) need
-            ARP arp = new ARP();
-            arp.setSenderProtocolAddress(IP)
-            .setSenderHardwareAddress(MAC.toBytes())
-            .setTargetHardwareAddress(BCMAC.toBytes())
-            .setTargetProtocolAddress(IP);
-
-            Ethernet eth = new Ethernet();
-            eth.setEtherType(Ethernet.TYPE_ARP)
-            .setVlanID(VLAN.toShort())
-            .setSourceMACAddress(MAC)
-            .setDestinationMACAddress(BCMAC)
-            .setPayload(arp);
-
-            return eth;
-        }
-
-        @Override
-        public byte[] unparsed() {
-            return null;
-        }
-
-        @Override
-        public Dpid dpid() {
-            return swid;
-        }
-
-        @Override
-        public Integer inPort() {
-            return INPORT;
-        }
-
-        @Override
-        public boolean isHandled() {
-            return false;
-        }
-
-        @Override
-        public boolean isBuffered() {
-            return false;
-        }
-
-    }
-}

-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014 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 xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-of-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-of-provider-link</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS OpenFlow protocol link provider</description>
-
-</project>

-/*
- * Copyright 2014 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.provider.of.link.impl;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-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.onosproject.net.DeviceId;
-import org.onosproject.net.link.LinkProvider;
-import org.onosproject.net.link.LinkProviderRegistry;
-import org.onosproject.net.link.LinkProviderService;
-import org.onosproject.net.provider.AbstractProvider;
-import org.onosproject.net.provider.ProviderId;
-import org.onosproject.openflow.controller.Dpid;
-import org.onosproject.openflow.controller.OpenFlowController;
-import org.onosproject.openflow.controller.OpenFlowPacketContext;
-import org.onosproject.openflow.controller.OpenFlowSwitch;
-import org.onosproject.openflow.controller.OpenFlowSwitchListener;
-import org.onosproject.openflow.controller.PacketListener;
-import org.onosproject.openflow.controller.RoleState;
-import org.projectfloodlight.openflow.protocol.OFPortConfig;
-import org.projectfloodlight.openflow.protocol.OFPortDesc;
-import org.projectfloodlight.openflow.protocol.OFPortState;
-import org.projectfloodlight.openflow.protocol.OFPortStatus;
-import org.slf4j.Logger;
-
-
-/**
- * Provider which uses an OpenFlow controller to detect network
- * infrastructure links.
- */
-@Component(immediate = true)
-@Deprecated
-public class OpenFlowLinkProvider extends AbstractProvider implements LinkProvider {
-
-    private final Logger log = getLogger(getClass());
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected LinkProviderRegistry providerRegistry;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected OpenFlowController controller;
-
-    private LinkProviderService providerService;
-
-    private final boolean useBDDP = true;
-
-    private final InternalLinkProvider listener = new InternalLinkProvider();
-
-    protected final Map<Dpid, LinkDiscovery> discoverers = new ConcurrentHashMap<>();
-
-    /**
-     * Creates an OpenFlow link provider.
-     */
-    public OpenFlowLinkProvider() {
-        super(new ProviderId("of", "org.onosproject.provider.openflow"));
-    }
-
-    @Activate
-    public void activate() {
-        providerService = providerRegistry.register(this);
-        controller.addListener(listener);
-        controller.addPacketListener(0, listener);
-        for (OpenFlowSwitch sw : controller.getSwitches()) {
-            listener.switchAdded(new Dpid(sw.getId()));
-        }
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        for (LinkDiscovery ld : discoverers.values()) {
-            ld.stop();
-        }
-        providerRegistry.unregister(this);
-        controller.removeListener(listener);
-        controller.removePacketListener(listener);
-        providerService = null;
-
-        log.info("Stopped");
-    }
-
-
-    private class InternalLinkProvider implements PacketListener, OpenFlowSwitchListener {
-
-
-        @Override
-        public void handlePacket(OpenFlowPacketContext pktCtx) {
-            LinkDiscovery ld = discoverers.get(pktCtx.dpid());
-            if (ld == null) {
-                return;
-            }
-            if (ld.handleLLDP(pktCtx.unparsed(), pktCtx.inPort())) {
-                pktCtx.block();
-            }
-
-        }
-
-        @Override
-        public void switchAdded(Dpid dpid) {
-            discoverers.put(dpid, new LinkDiscovery(controller.getSwitch(dpid),
-                    controller, providerService, useBDDP));
-
-        }
-
-        @Override
-        public void switchRemoved(Dpid dpid) {
-            LinkDiscovery ld = discoverers.remove(dpid);
-            if (ld != null) {
-                ld.removeAllPorts();
-            }
-            providerService.linksVanished(
-                    DeviceId.deviceId("of:" + Long.toHexString(dpid.value())));
-        }
-
-
-        @Override
-        public void switchChanged(Dpid dpid) {
-            //might not need to do anything since DeviceManager is notified
-        }
-
-        @Override
-        public void portChanged(Dpid dpid, OFPortStatus status) {
-            LinkDiscovery ld = discoverers.get(dpid);
-            if (ld == null) {
-                return;
-            }
-            final OFPortDesc port = status.getDesc();
-            final boolean enabled = !port.getState().contains(OFPortState.LINK_DOWN) &&
-                    !port.getConfig().contains(OFPortConfig.PORT_DOWN);
-            if (enabled) {
-                ld.addPort(port);
-            } else {
-                /*
-                 * remove port calls linkVanished
-                 */
-                ld.removePort(port);
-            }
-
-        }
-
-        @Override
-        public void receivedRoleReply(Dpid dpid, RoleState requested,
-                RoleState response) {
-            // do nothing for this.
-        }
-
-    }
-
-}

-/*
- * Copyright 2014 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.
- */
-
-/**
- * Provider that uses OpenFlow controller as a means of infrastructure link inference.
- */
-package org.onosproject.provider.of.link.impl;

@@ -33,8 +33,6 @@
 
 
     <modules>
     <modules>
         <module>device</module>
         <module>device</module>
-        <module>link</module>
-        <module>host</module>
         <module>packet</module>
         <module>packet</module>
         <module>flow</module>
         <module>flow</module>
         <module>group</module>
         <module>group</module>