Removed deprecated null provider sub-modules.

Change-Id: I154bdbc5eb27ce79ae5428ec6dc01b1dc09be8b0

-<?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-null-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-null-provider-device</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS Null protocol device provider</description>
-
-    <dependencies>
-      <dependency>
-        <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.compendium</artifactId>
-      </dependency>
-    </dependencies>
-
-</project>

-/*
- * Copyright 2014-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.provider.nil.device.impl;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-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.Modified;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.packet.ChassisId;
-import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.cluster.ClusterService;
-import org.onosproject.cluster.NodeId;
-import org.onosproject.net.Device;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.MastershipRole;
-import org.onosproject.net.Port;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DefaultDeviceDescription;
-import org.onosproject.net.device.DefaultPortDescription;
-import org.onosproject.net.device.DeviceDescription;
-import org.onosproject.net.device.DeviceProvider;
-import org.onosproject.net.device.DeviceProviderRegistry;
-import org.onosproject.net.device.DeviceProviderService;
-import org.onosproject.net.device.PortDescription;
-import org.onosproject.net.provider.AbstractProvider;
-import org.onosproject.net.provider.ProviderId;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Dictionary;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.onlab.util.Tools.*;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Provider which advertises fake/nonexistant devices to the core.
- * nodeID is passed as part of the fake device id so that multiple nodes can run simultaneously.
- * To be used for benchmarking only.
- */
-@Component(immediate = true)
-public class NullDeviceProvider extends AbstractProvider implements DeviceProvider {
-
-    private static final Logger log = getLogger(NullDeviceProvider.class);
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ClusterService clusterService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceProviderRegistry providerRegistry;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ComponentConfigService cfgService;
-
-    private DeviceProviderService providerService;
-
-    private ExecutorService deviceBuilder =
-            Executors.newFixedThreadPool(1, groupedThreads("onos/null", "device-creator"));
-
-    private static final String SCHEME = "null";
-    private static final int DEF_NUMDEVICES = 10;
-    private static final int DEF_NUMPORTS = 10;
-
-    //Delay between events in ms.
-    private static final int EVENTINTERVAL = 5;
-
-    private final Map<Integer, DeviceDescription> descriptions = Maps.newHashMap();
-
-    @Property(name = "devConfigs", value = "", label = "Instance-specific configurations")
-    private String devConfigs = null;
-
-    private int numDevices = DEF_NUMDEVICES;
-
-    @Property(name = "numPorts", intValue = 10, label = "Number of ports per devices")
-    private int numPorts = DEF_NUMPORTS;
-
-    private DeviceCreator creator;
-
-    /**
-     *
-     * Creates a provider with the supplier identifier.
-     *
-     */
-    public NullDeviceProvider() {
-        super(new ProviderId("null", "org.onosproject.provider.nil"));
-    }
-
-    @Activate
-    public void activate(ComponentContext context) {
-        cfgService.registerProperties(getClass());
-        providerService = providerRegistry.register(this);
-        if (!modified(context)) {
-            deviceBuilder.submit(new DeviceCreator(true));
-        }
-        log.info("Started");
-
-    }
-
-    @Deactivate
-    public void deactivate(ComponentContext context) {
-        cfgService.unregisterProperties(getClass(), false);
-        deviceBuilder.submit(new DeviceCreator(false));
-        try {
-            deviceBuilder.awaitTermination(1000, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            log.error("Device builder did not terminate");
-        }
-        deviceBuilder.shutdownNow();
-        providerRegistry.unregister(this);
-        providerService = null;
-
-        log.info("Stopped");
-    }
-
-    @Modified
-    public boolean modified(ComponentContext context) {
-        if (context == null) {
-            log.info("No configuration file, using defaults: numDevices={}, numPorts={}",
-                    numDevices, numPorts);
-            return false;
-        }
-
-        Dictionary<?, ?> properties = context.getProperties();
-
-        int newDevNum = DEF_NUMDEVICES;
-        int newPortNum = DEF_NUMPORTS;
-        try {
-            String s = get(properties, "devConfigs");
-            if (!isNullOrEmpty(s)) {
-                newDevNum = getDevicesConfig(s);
-            }
-            s = get(properties, "numPorts");
-            newPortNum = isNullOrEmpty(s) ? DEF_NUMPORTS : Integer.parseInt(s.trim());
-        } catch (NumberFormatException e) {
-            log.warn(e.getMessage());
-            newDevNum = numDevices;
-            newPortNum = numPorts;
-        }
-
-        boolean chgd = false;
-        if (newDevNum != numDevices) {
-            numDevices = newDevNum;
-            chgd |= true;
-        }
-        if (newPortNum != numPorts) {
-            numPorts = newPortNum;
-            chgd |= true;
-        }
-        log.info("Using settings numDevices={}, numPorts={}", numDevices, numPorts);
-        if (chgd) {
-            deviceBuilder.submit(new DeviceCreator(true));
-        }
-        return chgd;
-    }
-
-    private int getDevicesConfig(String config) {
-        for (String sub : config.split(",")) {
-            String[] params = sub.split(":");
-            if (params.length == 2) {
-                NodeId that = new NodeId(params[0].trim());
-                String nd = params[1];
-                if (clusterService.getLocalNode().id().equals(that)) {
-                    return Integer.parseInt(nd.trim());
-                }
-                continue;
-            }
-        }
-        return DEF_NUMDEVICES;
-    }
-
-    @Override
-    public void triggerProbe(DeviceId deviceId) {}
-
-    @Override
-    public void roleChanged(DeviceId deviceId, MastershipRole newRole) {}
-
-    @Override
-    public boolean isReachable(DeviceId deviceId) {
-        return descriptions.values().stream()
-                .anyMatch(desc -> desc.deviceURI().equals(deviceId.uri()));
-    }
-
-
-    private class DeviceCreator implements Runnable {
-
-        private boolean setup;
-
-        public DeviceCreator(boolean setup) {
-            this.setup = setup;
-        }
-
-        @Override
-        public void run() {
-            if (setup) {
-                try {
-                    advertiseDevices();
-                } catch (URISyntaxException e) {
-                    log.warn("URI creation failed during device adverts {}", e.getMessage());
-                }
-            } else {
-                removeDevices();
-            }
-        }
-
-        private void removeDevices() {
-            for (DeviceDescription desc : descriptions.values()) {
-                providerService.deviceDisconnected(
-                        DeviceId.deviceId(desc.deviceURI()));
-                delay(EVENTINTERVAL);
-            }
-            descriptions.clear();
-        }
-
-        private void advertiseDevices() throws URISyntaxException {
-            DeviceId did;
-            ChassisId cid;
-
-            // nodeIdHash takes into account for nodeID to avoid collisions when running multi-node providers.
-            long nodeIdHash = clusterService.getLocalNode().id().hashCode() << 16;
-
-            for (int i = 0; i < numDevices; i++) {
-                long id = nodeIdHash | i;
-
-                did = DeviceId.deviceId(new URI(SCHEME, toHex(id), null));
-                cid = new ChassisId(i);
-                DeviceDescription desc =
-                        new DefaultDeviceDescription(did.uri(), Device.Type.SWITCH,
-                                                     "ON.Lab", "0.0.1", "0.0.1", "1234",
-                                                     cid);
-                descriptions.put(i, desc);
-                providerService.deviceConnected(did, desc);
-                providerService.updatePorts(did, buildPorts());
-                delay(EVENTINTERVAL);
-            }
-        }
-
-        private List<PortDescription> buildPorts() {
-            List<PortDescription> ports = Lists.newArrayList();
-            for (int i = 0; i < numPorts; i++) {
-                ports.add(new DefaultPortDescription(PortNumber.portNumber(i), true,
-                                                     Port.Type.COPPER,
-                                                     0));
-            }
-            return ports;
-        }
-    }
-}

-/*
- * Copyright 2014-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.
- */
-
-/**
- * Provider that advertises fake devices.
- */
-package org.onosproject.provider.nil.device.impl;

-<?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-null-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-null-provider-flow</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS Null protocol flow provider</description>
-
-</project>

-/*
- * 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.provider.nil.flow.impl;
-
-import com.google.common.collect.Sets;
-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.jboss.netty.util.HashedWheelTimer;
-import org.jboss.netty.util.Timeout;
-import org.jboss.netty.util.TimerTask;
-import org.onlab.util.Timer;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.flow.CompletedBatchOperation;
-import org.onosproject.net.flow.DefaultFlowEntry;
-import org.onosproject.net.flow.FlowEntry;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.FlowRuleBatchEntry;
-import org.onosproject.net.flow.FlowRuleBatchOperation;
-import org.onosproject.net.flow.FlowRuleProvider;
-import org.onosproject.net.flow.FlowRuleProviderRegistry;
-import org.onosproject.net.flow.FlowRuleProviderService;
-import org.onosproject.net.provider.AbstractProvider;
-import org.onosproject.net.provider.ProviderId;
-import org.slf4j.Logger;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Null provider to accept any flow and report them.
- */
-@Component(immediate = true)
-public class NullFlowRuleProvider extends AbstractProvider implements FlowRuleProvider {
-
-    private final Logger log = getLogger(getClass());
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected FlowRuleProviderRegistry providerRegistry;
-
-    private ConcurrentMap<DeviceId, Set<FlowEntry>> flowTable = new ConcurrentHashMap<>();
-
-    private FlowRuleProviderService providerService;
-
-    private HashedWheelTimer timer = Timer.getTimer();
-    private Timeout timeout;
-
-    public NullFlowRuleProvider() {
-        super(new ProviderId("null", "org.onosproject.provider.nil"));
-    }
-
-    @Activate
-    public void activate() {
-        providerService = providerRegistry.register(this);
-        timeout = timer.newTimeout(new StatisticTask(), 5, TimeUnit.SECONDS);
-
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        providerRegistry.unregister(this);
-        providerService = null;
-        timeout.cancel();
-
-        log.info("Stopped");
-    }
-
-    @Override
-    public void applyFlowRule(FlowRule... flowRules) {}
-
-    @Override
-    public void removeFlowRule(FlowRule... flowRules) {}
-
-    @Override
-    public void removeRulesById(ApplicationId id, FlowRule... flowRules) {
-        log.info("removal by app id not supported in null provider");
-    }
-
-    @Override
-    public void executeBatch(
-            FlowRuleBatchOperation batch) {
-        Set<FlowEntry> flowRules = flowTable.getOrDefault(batch.deviceId(), Sets.newConcurrentHashSet());
-        for (FlowRuleBatchEntry fbe : batch.getOperations()) {
-            switch (fbe.operator()) {
-                case ADD:
-                    flowRules.add(new DefaultFlowEntry(fbe.target()));
-                    break;
-                case REMOVE:
-                    flowRules.remove(new DefaultFlowEntry(fbe.target()));
-                    break;
-                case MODIFY:
-                    FlowEntry entry = new DefaultFlowEntry(fbe.target());
-                    flowRules.remove(entry);
-                    flowRules.add(entry);
-                    break;
-                default:
-                    log.error("Unknown flow operation: {}", fbe);
-            }
-        }
-        flowTable.put(batch.deviceId(), flowRules);
-        providerService.batchOperationCompleted(batch.id(),
-                                                new CompletedBatchOperation(
-                                                        true,
-                                                        Collections.emptySet(),
-                                                        batch.deviceId()));
-    }
-
-    private class StatisticTask implements TimerTask {
-
-        @Override
-        public void run(Timeout to) throws Exception {
-            for (DeviceId devId : flowTable.keySet()) {
-                    providerService.pushFlowMetrics(devId,
-                                                    flowTable.getOrDefault(devId, Collections.emptySet()));
-            }
-            timeout = timer.newTimeout(to.getTask(), 5, TimeUnit.SECONDS);
-
-        }
-    }
-}

-/*
- * Copyright 2014-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.
- */
-
-/**
- * Provider that will accept any flow rules.
- */
-package org.onosproject.provider.nil.flow.impl;

-<?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-null-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-null-provider-host</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS Null host provider</description>
-
-</project>

-/*
- * 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.provider.nil.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.MacAddress;
-import org.onlab.packet.VlanId;
-import org.onosproject.cluster.ClusterService;
-import org.onosproject.mastership.MastershipService;
-import org.onosproject.net.Device;
-import org.onosproject.net.Host;
-import org.onosproject.net.HostId;
-import org.onosproject.net.HostLocation;
-import org.onosproject.net.MastershipRole;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DeviceEvent;
-import org.onosproject.net.device.DeviceListener;
-import org.onosproject.net.device.DeviceService;
-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.slf4j.Logger;
-
-import static org.onlab.util.Tools.toHex;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Null provider to advertise fake hosts.
- */
-@Component(immediate = true)
-public class NullHostProvider extends AbstractProvider implements HostProvider {
-
-    private final Logger log = getLogger(getClass());
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected MastershipService roleService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ClusterService nodeService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected HostProviderRegistry providerRegistry;
-
-    private HostProviderService providerService;
-
-    //make sure the device has enough ports to accomodate all of them.
-    private static final int HOSTSPERDEVICE = 5;
-
-    private final InternalHostProvider hostProvider = new InternalHostProvider();
-
-    /**
-     * Creates an OpenFlow host provider.
-     */
-    public NullHostProvider() {
-        super(new ProviderId("null", "org.onosproject.provider.nil"));
-    }
-
-    /**
-     * Creates a provider with the supplier identifier.
-     *
-     * @param id provider id
-     */
-    protected NullHostProvider(ProviderId id) {
-        super(id);
-    }
-
-    @Activate
-    public void activate() {
-        providerService = providerRegistry.register(this);
-        for (Device dev : deviceService.getDevices()) {
-            addHosts(dev);
-        }
-        deviceService.addListener(hostProvider);
-
-        log.info("Started");
-    }
-
-    @Deactivate
-    public void deactivate() {
-        providerRegistry.unregister(this);
-        deviceService.removeListener(hostProvider);
-        providerService = null;
-        log.info("Stopped");
-    }
-
-    @Override
-    public void triggerProbe(Host host) {}
-
-    private void addHosts(Device device) {
-        String nhash = toHex(nodeService.getLocalNode().id().hashCode());
-        String dhash = device.id().toString();
-        // make sure this instance owns the device.
-        if (!nhash.substring(nhash.length() - 3)
-                .equals(dhash.substring(14, 17))) {
-            log.warn("Device {} is not mine. Can't add hosts.", device.id());
-            return;
-        }
-        for (int i = 0; i < HOSTSPERDEVICE; i++) {
-            providerService.hostDetected(
-                    HostId.hostId(MacAddress.valueOf(i + device.hashCode()),
-                                  VlanId.vlanId((short) -1)),
-                    buildHostDescription(device, i));
-        }
-    }
-
-    private void removeHosts(Device device) {
-        for (int i = 0; i < HOSTSPERDEVICE; i++) {
-            providerService.hostVanished(
-                    HostId.hostId(MacAddress.valueOf(i + device.hashCode()),
-                                  VlanId.vlanId((short) -1)));
-        }
-    }
-
-    private HostDescription buildHostDescription(Device device, int port) {
-        MacAddress mac = MacAddress.valueOf(device.hashCode() + port);
-        HostLocation location = new HostLocation(device.id(),
-                                                 PortNumber.portNumber(port), 0L);
-        return new DefaultHostDescription(mac, VlanId.vlanId((short) -1), location);
-    }
-
-    private class InternalHostProvider implements DeviceListener {
-        @Override
-        public void event(DeviceEvent event) {
-            Device dev = event.subject();
-            if (!deviceService.getRole(event.subject().id()).equals(
-                    MastershipRole.MASTER)) {
-                log.info("Local node is not master for device {}", event
-                        .subject().id());
-                return;
-            }
-            switch (event.type()) {
-
-                case DEVICE_ADDED:
-                    addHosts(dev);
-                    break;
-                case DEVICE_UPDATED:
-                    break;
-                case DEVICE_REMOVED:
-                    removeHosts(dev);
-                    break;
-                case DEVICE_SUSPENDED:
-                    break;
-                case DEVICE_AVAILABILITY_CHANGED:
-                    break;
-                case PORT_ADDED:
-                    break;
-                case PORT_UPDATED:
-                    break;
-                case PORT_REMOVED:
-                    break;
-                default:
-                    break;
-            }
-        }
-
-    }
-
-}

-/*
- * Copyright 2014-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.
- */
-
-/**
- * Provider that advertises fake hosts.
- */
-package org.onosproject.provider.nil.host.impl;

-<?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-null-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-null-provider-link</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS Null link provider</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

-/*
- * Copyright 2014-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.
- */
-
-/**
- * Provider that advertises fake links.
- */
-package org.onosproject.provider.nil.link.impl;

-<?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-null-providers</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>onos-null-provider-packet</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS Null packet provider</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

-/*
- * 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.provider.nil.packet.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.Modified;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.ICMP;
-import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.net.ConnectPoint;
-import org.onosproject.net.Device;
-import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DeviceService;
-import org.onosproject.net.packet.DefaultInboundPacket;
-import org.onosproject.net.packet.DefaultPacketContext;
-import org.onosproject.net.packet.InboundPacket;
-import org.onosproject.net.packet.OutboundPacket;
-import org.onosproject.net.packet.PacketContext;
-import org.onosproject.net.packet.PacketProvider;
-import org.onosproject.net.packet.PacketProviderRegistry;
-import org.onosproject.net.packet.PacketProviderService;
-import org.onosproject.net.provider.AbstractProvider;
-import org.onosproject.net.provider.ProviderId;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-
-import java.nio.ByteBuffer;
-import java.util.Dictionary;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.onlab.util.Tools.delay;
-import static org.onlab.util.Tools.groupedThreads;
-import static org.slf4j.LoggerFactory.getLogger;
-
-/**
- * Provider which 1) intercepts network-bound messages from the core, and 2)
- * generates PacketEvents at some tunable rate. To be used for benchmarking
- * only.
- */
-@Component(immediate = true)
-public class NullPacketProvider extends AbstractProvider implements
-        PacketProvider {
-
-    private final Logger log = getLogger(getClass());
-
-    // Default packetEvent generation rate (in packets/sec)
-    // If 0, we are just a sink for network-bound packets
-    private static final int DEFAULT_RATE = 5;
-    // arbitrary host "destination"
-    private static final int DESTHOST = 5;
-
-    private PacketProviderService providerService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected PacketProviderRegistry providerRegistry;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ComponentConfigService cfgService;
-
-    // Rate to generate PacketEvents, per second
-    @Property(name = "pktRate", intValue = DEFAULT_RATE,
-            label = "Rate of PacketEvent generation")
-    private int pktRate = DEFAULT_RATE;
-
-    private ExecutorService packetDriver =
-            Executors.newFixedThreadPool(1, groupedThreads("onos/null", "packet-driver"));
-
-    public NullPacketProvider() {
-        super(new ProviderId("null", "org.onosproject.provider.nil"));
-    }
-
-    @Activate
-    public void activate(ComponentContext context) {
-        cfgService.registerProperties(getClass());
-        providerService = providerRegistry.register(this);
-        if (!modified(context)) {
-            packetDriver.submit(new PacketDriver());
-        }
-        log.info("started");
-    }
-
-    @Deactivate
-    public void deactivate(ComponentContext context) {
-        cfgService.unregisterProperties(getClass(), false);
-        try {
-            packetDriver.awaitTermination(1000, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            log.error("PacketDriver did not terminate");
-        }
-        packetDriver.shutdownNow();
-        providerRegistry.unregister(this);
-        log.info("stopped");
-    }
-
-    @Modified
-    public boolean modified(ComponentContext context) {
-        if (context == null) {
-            log.info("No configuration change, using defaults: pktRate={}",
-                    DEFAULT_RATE);
-            return false;
-        }
-        Dictionary<?, ?> properties = context.getProperties();
-
-        int newRate;
-        try {
-            String s = String.valueOf(properties.get("pktRate"));
-            newRate = isNullOrEmpty(s) ? pktRate : Integer.parseInt(s.trim());
-        } catch (NumberFormatException | ClassCastException e) {
-            log.warn(e.getMessage());
-            newRate = pktRate;
-        }
-
-        if (newRate != pktRate) {
-            pktRate = newRate;
-            packetDriver.submit(new PacketDriver());
-            log.info("Using new settings: pktRate={}", pktRate);
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public void emit(OutboundPacket packet) {
-        // We don't have a network to emit to. Keep a counter here, maybe?
-    }
-
-    /**
-     * Generates packet events at a given rate.
-     */
-    private class PacketDriver implements Runnable {
-
-        // time between event firing, in milliseconds
-        int pktInterval;
-        // filler echo request
-        ICMP icmp;
-        Ethernet eth;
-
-        public PacketDriver() {
-            pktInterval = 1000 / pktRate;
-            icmp = new ICMP();
-            icmp.setIcmpType((byte) 8).setIcmpCode((byte) 0)
-                    .setChecksum((short) 0);
-            eth = new Ethernet();
-            eth.setEtherType(Ethernet.TYPE_IPV4);
-            eth.setPayload(icmp);
-        }
-
-        @Override
-        public void run() {
-            log.info("PacketDriver started");
-            while (!packetDriver.isShutdown()) {
-                for (Device dev : deviceService.getDevices()) {
-                    sendEvents(dev);
-                }
-            }
-        }
-
-        private void sendEvents(Device dev) {
-            // make it look like things came from ports attached to hosts
-            for (int i = 0; i < 4; i++) {
-                eth.setSourceMACAddress("00:00:10:00:00:0" + i)
-                        .setDestinationMACAddress("00:00:10:00:00:0" + DESTHOST);
-                InboundPacket inPkt = new DefaultInboundPacket(
-                        new ConnectPoint(dev.id(), PortNumber.portNumber(i)),
-                        eth, ByteBuffer.wrap(eth.serialize()));
-                PacketContext pctx = new NullPacketContext(
-                        System.currentTimeMillis(), inPkt, null, false);
-                providerService.processPacket(pctx);
-                delay(pktInterval);
-            }
-        }
-
-    }
-
-    /**
-     * Minimal PacketContext to make core + applications happy.
-     */
-    private class NullPacketContext extends DefaultPacketContext {
-
-        public NullPacketContext(long time, InboundPacket inPkt,
-                OutboundPacket outPkt, boolean block) {
-            super(time, inPkt, outPkt, block);
-        }
-
-        @Override
-        public void send() {
-            // We don't send anything out.
-        }
-
-    }
-
-}

-/*
- * Copyright 2014-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.
- */
-
-/**
- * Provider that sends and brings packets to & from oblivion.
- */
-package org.onosproject.provider.nil.packet.impl;

@@ -29,7 +29,7 @@
     <artifactId>onos-null-provider</artifactId>
     <artifactId>onos-null-provider</artifactId>
     <packaging>bundle</packaging>
     <packaging>bundle</packaging>
 
 
-    <description>ONOS null protocol adapters</description>
+    <description>Null southbound providers application</description>
 
 
     <dependencies>
     <dependencies>
         <dependency>
         <dependency>