mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 18:32:28 +02:00
Code Issues Projects Releases Wiki Activity

Few core changes in preparation of P4Runtime subsystem refactoring

Browse Source 
Refactoring aims at providing a more robust connection procedure of
P4Runtime-based devices.

Refactoring requires devices to be registered to the core with
available=false (i.e. offline), and marked online only when the P4
pipeline has been deployed to the device. Also, it leaves the duty of
handling pipeconf-specific drivers to the driver subsystem, instead of
having the GeneralDeviceProvider take care of it, which resulted to be
brittle.

Changes include:
- Choose not to mark device online when re-asserting mastership role by
declaring special device annotation.
- Lookup drivers in device projectable model unsing driver service
device-based method, which is consistent with the way other subsystems
look for device drivers.
- In DriverManager, when looking for device drivers, consider the case
of pipeconf-programmable devices, in which case a special "merged"
driver needs to instantiated at runtime.
- In PacketManager, push flow objectives only if device is available
(i.e. after pipeline has been deployed).

Change-Id: I80f78a4f40730a06cb82fa55fefab08a91a89268
This commit is contained in:
Carmelo Cascone 2018-08-29 19:22:50 -07:00
parent 2f1fb8de50
commit 0761cd3cc0
16 changed files with 204 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/cfm/app/src/test/java/org/onosproject/incubator/net/l2monitoring/cfm/impl/CfmMepManagerTest.java
View File

@ -78,10 +78,10 @@ import java.util.concurrent.atomic.AtomicLong;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.onosproject.net.NetTestTools.injectEventDispatcher;
@ -222,7 +222,8 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID2)).andReturn(device2).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID2)).andReturn(testDriver).anyTimes();
replay(driverService);
Collection<MepEntry> mepEntries = mepManager.getAllMeps(MDNAME1, MANAME1);
@ -241,7 +242,7 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID1)).andReturn(device1).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
MepEntry mepEntry = mepManager.getMep(MDNAME1, MANAME1, MEPID1);
@ -260,7 +261,7 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID1)).andReturn(null).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
try {
@ -282,7 +283,8 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID2)).andReturn(device2).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID2)).andReturn(testDriver).anyTimes();
replay(driverService);
assertTrue(mepManager.deleteMep(MDNAME1, MANAME1, MEPID1, Optional.empty()));
@ -299,7 +301,8 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID2)).andReturn(device2).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID2)).andReturn(testDriver).anyTimes();
replay(driverService);
MepId mepId3 = MepId.valueOf((short) 3);
@ -336,7 +339,7 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(deviceId3)).andReturn(device3).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER_3)).andReturn(testDriver3).anyTimes();
expect(driverService.getDriver(deviceId3)).andReturn(testDriver3).anyTimes();
replay(driverService);
MepId mepId3 = MepId.valueOf((short) 3);
@ -362,7 +365,7 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID1)).andReturn(device1).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
MepLbCreate lbCreate = DefaultMepLbCreate.builder(MepId.valueOf((short) 11)).build();
@ -383,7 +386,7 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID1)).andReturn(device1).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
try {
@ -403,7 +406,7 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID1)).andReturn(device1).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
MepLtCreate ltCreate = DefaultMepLtCreate.builder(MepId.valueOf((short) 11)).build();
@ -428,7 +431,8 @@ public class CfmMepManagerTest {
expect(deviceService.getDevice(DEVICE_ID2)).andReturn(device2).anyTimes();
replay(deviceService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID2)).andReturn(testDriver).anyTimes();
replay(driverService);
// This is arranged like

12
apps/cfm/app/src/test/java/org/onosproject/incubator/net/l2monitoring/soam/impl/SoamManagerTest.java
View File

@ -172,7 +172,7 @@ public class SoamManagerTest {
expect(mepService.getMep(MDNAME1, MANAME1, MEPID1)).andReturn(mep1).anyTimes();
replay(mepService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
Collection<DelayMeasurementEntry> dmEntries =
@ -189,7 +189,7 @@ public class SoamManagerTest {
expect(mepService.getMep(MDNAME1, MANAME1, MEPID1)).andReturn(mep1).anyTimes();
replay(mepService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
DelayMeasurementEntry dmEntry =
@ -207,7 +207,7 @@ public class SoamManagerTest {
expect(mepService.getMep(MDNAME1, MANAME1, MEPID1)).andReturn(mep1).anyTimes();
replay(mepService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
DelayMeasurementStatCurrent dmCurrentStat =
@ -225,7 +225,7 @@ public class SoamManagerTest {
expect(mepService.getMep(MDNAME1, MANAME1, MEPID1)).andReturn(mep1).anyTimes();
replay(mepService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
Collection<DelayMeasurementStatHistory> dmHistoricalStats =
@ -243,7 +243,7 @@ public class SoamManagerTest {
expect(mepService.getMep(MDNAME1, MANAME1, MEPID1)).andReturn(mep1).anyTimes();
replay(mepService);
expect(driverService.getDriver(TEST_DRIVER)).andReturn(testDriver).anyTimes();
expect(driverService.getDriver(DEVICE_ID1)).andReturn(testDriver).anyTimes();
replay(driverService);
DelayMeasurementCreate dmCreate1 = DefaultDelayMeasurementCreate
@ -288,7 +288,7 @@ public class SoamManagerTest {
expect(mepService.getMep(MDNAME1, MANAME1, mepId3)).andReturn(mep3).anyTimes();
replay(mepService);
expect(driverService.getDriver(TEST_DRIVER_3)).andReturn(testDriver3).anyTimes();
expect(driverService.getDriver(deviceId3)).andReturn(testDriver3).anyTimes();
replay(driverService);
DelayMeasurementCreate dmCreate1 = DefaultDelayMeasurementCreate

10
core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
View File

@ -88,6 +88,16 @@ public final class AnnotationKeys {
*/
public static final String DRIVER = "driver";
/**
* Annotation key for the device availability behavior. The value of this key
* is expected to be a boolean ({@code true} or {@code false}) and it is
* used to determine if the device can be marked online by the core when
* deemed appropriate (value is {@code false}, default behaviour if key is
* not present), or if marking online should be left to providers ({@code
* true}).
*/
public static final String PROVIDER_MARK_ONLINE = "providerMarkOnline";
/**
* Annotation key for durable links.
*/

9
core/api/src/main/java/org/onosproject/net/DefaultDevice.java
View File

@ -16,6 +16,7 @@
package org.onosproject.net;
import org.onlab.packet.ChassisId;
import org.onlab.util.ItemNotFoundException;
import org.onosproject.net.driver.Behaviour;
import org.onosproject.net.driver.DefaultDriverHandler;
import org.onosproject.net.driver.Driver;
@ -152,9 +153,11 @@ public class DefaultDevice extends AbstractElement implements Device {
@Override
protected Driver locateDriver() {
Driver driver = super.locateDriver();
return driver != null ? driver :
driverService().getDriver(manufacturer, hwVersion, swVersion);
try {
return driverService().getDriver(id());
} catch (ItemNotFoundException e) {
return null;
}
}
/**

2
core/api/src/main/java/org/onosproject/net/pi/service/PiPipeconfService.java
View File

@ -98,7 +98,7 @@ public interface PiPipeconfService {
* @param pipeconfId a pipeconf identifier
* @return driver name or null.
*/
String mergeDriver(DeviceId deviceId, PiPipeconfId pipeconfId);
String getMergedDriver(DeviceId deviceId, PiPipeconfId pipeconfId);
/**
* Returns the pipeconf identifier currently associated with the given

65
core/api/src/test/java/org/onosproject/net/pi/PiPipeconfServiceAdapter.java Normal file
View File

@ -0,0 +1,65 @@
/*
* Copyright 2018-present Open Networking Foundation
*
* 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.net.pi;
import org.onosproject.net.DeviceId;
import org.onosproject.net.pi.model.PiPipeconf;
import org.onosproject.net.pi.model.PiPipeconfId;
import org.onosproject.net.pi.service.PiPipeconfService;
import java.util.Collections;
import java.util.Optional;
/**
* Test adapter of PiPipeconfService.
*/
public class PiPipeconfServiceAdapter implements PiPipeconfService {
@Override
public void register(PiPipeconf pipeconf) throws IllegalStateException {
}
@Override
public void remove(PiPipeconfId pipeconfId) throws IllegalStateException {
}
@Override
public Iterable<PiPipeconf> getPipeconfs() {
return Collections.emptyList();
}
@Override
public Optional<PiPipeconf> getPipeconf(PiPipeconfId id) {
return Optional.empty();
}
@Override
public void bindToDevice(PiPipeconfId pipeconfId, DeviceId deviceId) {
}
@Override
public String getMergedDriver(DeviceId deviceId, PiPipeconfId pipeconfId) {
return null;
}
@Override
public Optional<PiPipeconfId> ofDevice(DeviceId deviceId) {
return Optional.empty();
}
}

9
core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View File

@ -35,6 +35,7 @@ import org.onosproject.mastership.MastershipListener;
import org.onosproject.mastership.MastershipService;
import org.onosproject.mastership.MastershipTerm;
import org.onosproject.mastership.MastershipTermService;
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.Device;
import org.onosproject.net.Device.Type;
@ -823,6 +824,12 @@ public class DeviceManager
return (cfg == null || cfg.isAllowed());
}
private boolean canMarkOnline(Device device) {
final boolean providerMarkOnline = Boolean.parseBoolean(
device.annotations().value(AnnotationKeys.PROVIDER_MARK_ONLINE));
return !providerMarkOnline;
}
// Applies the specified role to the device; ignores NONE
/**
@ -884,7 +891,7 @@ public class DeviceManager
switch (myNextRole) {
case MASTER:
final Device device = getDevice(did);
if ((device != null) && !isAvailable(did)) {
if (device != null && !isAvailable(did) && canMarkOnline(device)) {
post(store.markOnline(did));
}
// TODO: should apply role only if there is mismatch

23
core/net/src/main/java/org/onosproject/net/driver/impl/DriverManager.java
View File

@ -36,6 +36,8 @@ import org.onosproject.net.driver.DriverHandler;
import org.onosproject.net.driver.DriverListener;
import org.onosproject.net.driver.DriverRegistry;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.pi.model.PiPipeconfId;
import org.onosproject.net.pi.service.PiPipeconfService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -71,6 +73,9 @@ public class DriverManager implements DriverService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected NetworkConfigService networkConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected PiPipeconfService pipeconfService;
@Activate
protected void activate() {
AbstractProjectableModel.setDriverService(null, this);
@ -113,9 +118,25 @@ public class DriverManager implements DriverService {
public Driver getDriver(DeviceId deviceId) {
checkPermission(DRIVER_READ);
Driver driver;
// Primary source of driver configuration is the network config.
if (pipeconfService.ofDevice(deviceId).isPresent()) {
// Device has pipeconf associated, look for merged driver.
// Implementation of PiPipeconfService is expected to look for a
// base driver in network config.
PiPipeconfId pipeconfId = pipeconfService.ofDevice(deviceId).get();
String mergedDriver = pipeconfService.getMergedDriver(deviceId, pipeconfId);
driver = mergedDriver != null ? lookupDriver(mergedDriver) : null;
if (driver != null) {
return driver;
} else {
log.error("Merged driver for {} with pipeconf {} not found, falling back.",
deviceId, pipeconfId);
}
}
BasicDeviceConfig cfg = networkConfigService.getConfig(deviceId, BasicDeviceConfig.class);
Driver driver = lookupDriver(cfg != null ? cfg.driver() : null);
driver = lookupDriver(cfg != null ? cfg.driver() : null);
if (driver != null) {
return driver;
}

4
core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
View File

@ -309,6 +309,10 @@ public class PacketManager
return;
}
if (!deviceService.isAvailable(device.id())) {
return;
}
ForwardingObjective forwarding = createBuilder(request)
.add(new ObjectiveContext() {
@Override

23
core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
View File

@ -27,7 +27,6 @@ import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.util.ItemNotFoundException;
import org.onosproject.cluster.ClusterService;
import org.onosproject.net.DeviceId;
import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigRegistry;
@ -40,7 +39,6 @@ import org.onosproject.net.driver.DriverAdminService;
import org.onosproject.net.driver.DriverEvent;
import org.onosproject.net.driver.DriverListener;
import org.onosproject.net.driver.DriverProvider;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.pi.model.PiPipeconf;
import org.onosproject.net.pi.model.PiPipeconfId;
import org.onosproject.net.pi.service.PiPipeconfConfig;
@ -80,18 +78,12 @@ public class PiPipeconfManager implements PiPipeconfService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected NetworkConfigRegistry cfgService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected DriverService driverService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected DriverAdminService driverAdminService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
private PiPipeconfMappingStore pipeconfMappingStore;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ClusterService clusterService;
// Registered pipeconf are replicated through the app subsystem and
// registered on app activated events. Hence, there should be no need of
// distributing this map.
@ -117,7 +109,7 @@ public class PiPipeconfManager implements PiPipeconfService {
@Activate
public void activate() {
cfgService.registerConfigFactory(configFactory);
driverService.addListener(driverListener);
driverAdminService.addListener(driverListener);
checkMissingMergedDrivers();
log.info("Started");
}
@ -127,12 +119,11 @@ public class PiPipeconfManager implements PiPipeconfService {
public void deactivate() {
executor.shutdown();
cfgService.unregisterConfigFactory(configFactory);
driverService.removeListener(driverListener);
driverAdminService.removeListener(driverListener);
pipeconfs.clear();
missingMergedDrivers.clear();
cfgService = null;
driverAdminService = null;
driverService = null;
log.info("Stopped");
}
@ -170,11 +161,17 @@ public class PiPipeconfManager implements PiPipeconfService {
@Override
public void bindToDevice(PiPipeconfId pipeconfId, DeviceId deviceId) {
PiPipeconfId existingPipeconfId = pipeconfMappingStore.getPipeconfId(deviceId);
if (existingPipeconfId != null && !existingPipeconfId.equals(pipeconfId)) {
log.error("Cannot set binding for {} to {} as one already exists ({})",
deviceId, pipeconfId, existingPipeconfId);
return;
}
pipeconfMappingStore.createOrUpdateBinding(deviceId, pipeconfId);
}
@Override
public String mergeDriver(DeviceId deviceId, PiPipeconfId pipeconfId) {
public String getMergedDriver(DeviceId deviceId, PiPipeconfId pipeconfId) {
log.debug("Starting device driver merge of {} with {}...", deviceId, pipeconfId);
final BasicDeviceConfig basicDeviceConfig = cfgService.getConfig(
deviceId, BasicDeviceConfig.class);
@ -298,7 +295,7 @@ public class PiPipeconfManager implements PiPipeconfService {
private Driver getDriver(String name) {
try {
return driverService.getDriver(name);
return driverAdminService.getDriver(name);
} catch (ItemNotFoundException e) {
return null;
}

17
core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
View File

@ -39,6 +39,7 @@ import org.onosproject.net.Device;
import org.onosproject.net.Device.Type;
import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.config.NetworkConfigServiceAdapter;
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.driver.DefaultDriver;
@ -51,7 +52,6 @@ import org.onosproject.net.flow.DefaultFlowRule;
import org.onosproject.net.flow.FlowEntry;
import org.onosproject.net.flow.FlowEntry.FlowEntryState;
import org.onosproject.net.flow.FlowRule;
import org.onosproject.net.flow.oldbatch.FlowRuleBatchOperation;
import org.onosproject.net.flow.FlowRuleEvent;
import org.onosproject.net.flow.FlowRuleListener;
import org.onosproject.net.flow.FlowRuleProgrammable;
@ -66,6 +66,8 @@ import org.onosproject.net.flow.criteria.Criterion;
import org.onosproject.net.flow.instructions.Instruction;
import org.onosproject.net.flow.instructions.Instructions;
import org.onosproject.net.flow.instructions.Instructions.MetadataInstruction;
import org.onosproject.net.flow.oldbatch.FlowRuleBatchOperation;
import org.onosproject.net.pi.PiPipeconfServiceAdapter;
import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.store.trivial.SimpleFlowRuleStore;
@ -84,9 +86,16 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.onosproject.net.NetTestTools.injectEventDispatcher;
import static org.onosproject.net.flow.FlowRuleEvent.Type.*;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_ADDED;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_ADD_REQUESTED;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_REMOVED;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_REMOVE_REQUESTED;
import static org.onosproject.net.flow.FlowRuleEvent.Type.RULE_UPDATED;
/**
* Test codifying the flow rule service & flow rule provider service contracts.
@ -712,6 +721,8 @@ public class FlowRuleManagerTest {
TestDriverManager(DriverRegistry registry) {
this.registry = registry;
this.deviceService = mgr.deviceService;
this.pipeconfService = new PiPipeconfServiceAdapter();
this.networkConfigService = new NetworkConfigServiceAdapter();
activate();
}
}

10
core/net/src/test/java/org/onosproject/net/group/impl/GroupManagerTest.java
View File

@ -37,6 +37,7 @@ import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.PortNumber;
import org.onosproject.net.config.NetworkConfigServiceAdapter;
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.driver.DefaultDriver;
@ -64,6 +65,7 @@ import org.onosproject.net.group.GroupProviderRegistry;
import org.onosproject.net.group.GroupProviderService;
import org.onosproject.net.group.GroupService;
import org.onosproject.net.group.StoredGroupEntry;
import org.onosproject.net.pi.PiPipeconfServiceAdapter;
import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.store.trivial.SimpleGroupStore;
@ -74,7 +76,11 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.onosproject.net.NetTestTools.injectEventDispatcher;
/**
@ -787,6 +793,8 @@ public class GroupManagerTest {
TestDriverManager(DriverRegistry registry) {
this.registry = registry;
this.deviceService = mgr.deviceService;
this.pipeconfService = new PiPipeconfServiceAdapter();
this.networkConfigService = new NetworkConfigServiceAdapter();
activate();
}
}

12
core/net/src/test/java/org/onosproject/net/meter/impl/MeterManagerTest.java
View File

@ -68,21 +68,26 @@ import org.onosproject.net.meter.MeterProviderService;
import org.onosproject.net.meter.MeterRequest;
import org.onosproject.net.meter.MeterService;
import org.onosproject.net.meter.MeterState;
import org.onosproject.net.pi.PiPipeconfServiceAdapter;
import org.onosproject.net.provider.AbstractProvider;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.TestStorageService;
import java.util.Collections;
import java.util.HashSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.onosproject.net.NetTestTools.APP_ID;
import static org.onosproject.net.NetTestTools.did;
import static org.onosproject.net.NetTestTools.injectEventDispatcher;
@ -526,6 +531,7 @@ public class MeterManagerTest {
this.registry = registry;
this.deviceService = deviceService;
this.networkConfigService = networkConfigService;
this.pipeconfService = new PiPipeconfServiceAdapter();
activate();
}
}

4
core/net/src/test/java/org/onosproject/net/packet/impl/PacketManagerTest.java
View File

@ -30,6 +30,7 @@ import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DefaultDevice;
import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
import org.onosproject.net.config.NetworkConfigServiceAdapter;
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.driver.AbstractHandlerBehaviour;
import org.onosproject.net.driver.DefaultDriver;
@ -41,6 +42,7 @@ import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.OutboundPacket;
import org.onosproject.net.packet.PacketProgrammable;
import org.onosproject.net.packet.PacketProviderRegistry;
import org.onosproject.net.pi.PiPipeconfServiceAdapter;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.provider.TestProvider;
import org.onosproject.store.trivial.SimplePacketStore;
@ -147,6 +149,8 @@ public class PacketManagerTest {
TestDriverManager(DriverRegistry registry) {
this.registry = registry;
this.deviceService = mgr.deviceService;
this.pipeconfService = new PiPipeconfServiceAdapter();
this.networkConfigService = new NetworkConfigServiceAdapter();
activate();
}
}

19
core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
View File

@ -42,8 +42,6 @@ import org.onosproject.net.driver.DriverAdapter;
import org.onosproject.net.driver.DriverAdminService;
import org.onosproject.net.driver.DriverAdminServiceAdapter;
import org.onosproject.net.driver.DriverProvider;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.driver.DriverServiceAdapter;
import org.onosproject.net.pi.model.PiPipeconf;
import org.onosproject.net.pi.model.PiPipeconfId;
import org.onosproject.net.pi.service.PiPipeconfConfig;
@ -72,7 +70,6 @@ public class PiPipeconfManagerTest {
//Mock util sets and classes
private final NetworkConfigRegistry cfgService = new MockNetworkConfigRegistry();
private final DriverService driverService = new MockDriverService();
private final DriverAdminService driverAdminService = new MockDriverAdminService();
private Driver baseDriver = new MockDriver();
@ -97,7 +94,6 @@ public class PiPipeconfManagerTest {
piPipeconfService = new PiPipeconfManager();
piPipeconf = BASIC_PIPECONF;
piPipeconfService.cfgService = cfgService;
piPipeconfService.driverService = driverService;
piPipeconfService.driverAdminService = driverAdminService;
String key = "piPipeconf";
ObjectMapper mapper = new ObjectMapper();
@ -112,7 +108,7 @@ public class PiPipeconfManagerTest {
@Test
public void activate() {
assertEquals("Incorrect driver service", driverService, piPipeconfService.driverService);
assertEquals("Incorrect driver admin service", driverAdminService, piPipeconfService.driverAdminService);
assertEquals("Incorrect driverAdminService service", driverAdminService, piPipeconfService.driverAdminService);
assertEquals("Incorrect configuration service", cfgService, piPipeconfService.cfgService);
assertTrue("Incorrect config factory", cfgFactories.contains(piPipeconfService.configFactory));
@ -121,7 +117,7 @@ public class PiPipeconfManagerTest {
@Test
public void deactivate() {
piPipeconfService.deactivate();
assertEquals("Incorrect driver service", null, piPipeconfService.driverService);
assertEquals("Incorrect driver admin service", null, piPipeconfService.driverAdminService);
assertEquals("Incorrect driverAdminService service", null, piPipeconfService.driverAdminService);
assertEquals("Incorrect configuration service", null, piPipeconfService.cfgService);
assertFalse("Config factory should be unregistered", cfgFactories.contains(piPipeconfService.configFactory));
@ -153,7 +149,10 @@ public class PiPipeconfManagerTest {
assertEquals("Returned PiPipeconf is not correct", piPipeconf,
piPipeconfService.getPipeconf(piPipeconf.id()).get());
String mergedDriverName = piPipeconfService.mergeDriver(DEVICE_ID, piPipeconfId);
String mergedDriverName = piPipeconfService.getMergedDriver(DEVICE_ID, piPipeconfId);
String expectedName = BASE_DRIVER + ":" + piPipeconfId.id();
assertEquals(expectedName, mergedDriverName);
//we assume that the provider is 1 and that it contains 1 driver
//we also assume that everything after driverAdminService.registerProvider(provider); has been tested.
@ -208,7 +207,8 @@ public class PiPipeconfManagerTest {
}
}
private class MockDriverService extends DriverServiceAdapter {
private class MockDriverAdminService extends DriverAdminServiceAdapter {
@Override
public Driver getDriver(String driverName) {
if (driverName.equals(BASE_DRIVER)) {
@ -216,9 +216,6 @@ public class PiPipeconfManagerTest {
}
throw new ItemNotFoundException("Driver not found");
}
}
private class MockDriverAdminService extends DriverAdminServiceAdapter {
@Override
public void registerProvider(DriverProvider provider) {

21
providers/general/device/src/main/java/org/onosproject/provider/general/device/impl/GeneralDeviceProvider.java
View File

@ -541,22 +541,23 @@ public class GeneralDeviceProvider extends AbstractProvider
}
final PiPipeconfId pipeconfId = pipeconf.id();
final String mergedDriverName = piPipeconfService.mergeDriver(
deviceId, pipeconfId);
if (mergedDriverName == null) {
log.error("Unable to get merged driver for {} and {}, aborting device discovery",
deviceId, pipeconfId);
return false;
}
// To be removed in change #19606
// final String mergedDriverName = piPipeconfService.mergeDriver(
// deviceId, pipeconfId);
// if (mergedDriverName == null) {
// log.error("Unable to get merged driver for {} and {}, aborting device discovery",
// deviceId, pipeconfId);
// return false;
// }
if (!asMaster) {
// From now one only the master.
return true;
}
if (!setDriverViaCfg(deviceId, mergedDriverName)) {
return false;
}
// if (!setDriverViaCfg(deviceId, mergedDriverName)) {
// return false;
// }
// FIXME: we just introduced a race condition as it might happen that a
// node does not receive the new cfg (with the merged driver) before the