ONOS-3124 Sketch of simplified intent domain service
Change-Id: I6d8304214897ba75a299bfd9bd90b4591ae8eb04
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/config/impl/ExtraNetworkConfigs.java b/incubator/net/src/main/java/org/onosproject/incubator/net/config/impl/ExtraNetworkConfigs.java
index e77e1da..74936f9 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/config/impl/ExtraNetworkConfigs.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/config/impl/ExtraNetworkConfigs.java
@@ -21,8 +21,6 @@
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.onosproject.incubator.net.domain.IntentDomainConfig;
-import org.onosproject.incubator.net.domain.IntentDomainId;
import org.onosproject.net.config.ConfigFactory;
import org.onosproject.net.config.NetworkConfigRegistry;
import org.slf4j.Logger;
@@ -30,8 +28,6 @@
import java.util.Set;
-import static org.onosproject.incubator.net.config.basics.ExtraSubjectFactories.INTENT_DOMAIN_SUBJECT_FACTORY;
-
/**
* Component for registration of builtin basic network configurations.
*/
@@ -40,16 +36,7 @@
private final Logger log = LoggerFactory.getLogger(getClass());
- private final Set<ConfigFactory> factories = ImmutableSet.of(
- new ConfigFactory<IntentDomainId, IntentDomainConfig>(INTENT_DOMAIN_SUBJECT_FACTORY,
- IntentDomainConfig.class,
- "basic") {
- @Override
- public IntentDomainConfig createConfig() {
- return new IntentDomainConfig();
- }
- }
- );
+ private final Set<ConfigFactory> factories = ImmutableSet.of();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected NetworkConfigRegistry registry;
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/domain/impl/IntentDomainManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/domain/impl/IntentDomainManager.java
index 33c8a3c..6365394 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/domain/impl/IntentDomainManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/domain/impl/IntentDomainManager.java
@@ -15,40 +15,30 @@
*/
package org.onosproject.incubator.net.domain.impl;
-import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-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.apache.felix.scr.annotations.Service;
-import org.onlab.graph.AdjacencyListsGraph;
-import org.onlab.graph.Graph;
-import org.onosproject.core.ApplicationId;
-import org.onosproject.core.CoreService;
-import org.onosproject.net.config.NetworkConfigEvent;
-import org.onosproject.net.config.NetworkConfigListener;
-import org.onosproject.net.config.NetworkConfigService;
-import org.onosproject.incubator.net.domain.DomainEdge;
-import org.onosproject.incubator.net.domain.DomainVertex;
import org.onosproject.incubator.net.domain.IntentDomain;
-import org.onosproject.incubator.net.domain.IntentDomainAdminService;
-import org.onosproject.incubator.net.domain.IntentDomainConfig;
+import org.onosproject.incubator.net.domain.IntentDomainEvent;
import org.onosproject.incubator.net.domain.IntentDomainId;
import org.onosproject.incubator.net.domain.IntentDomainListener;
import org.onosproject.incubator.net.domain.IntentDomainProvider;
+import org.onosproject.incubator.net.domain.IntentDomainProviderRegistry;
+import org.onosproject.incubator.net.domain.IntentDomainProviderService;
import org.onosproject.incubator.net.domain.IntentDomainService;
+import org.onosproject.incubator.net.domain.IntentPrimitive;
+import org.onosproject.incubator.net.domain.IntentResource;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.provider.AbstractListenerProviderRegistry;
+import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
+import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
@@ -59,80 +49,21 @@
@Component(immediate = true)
@Service
public class IntentDomainManager
- implements IntentDomainService, IntentDomainAdminService {
+ extends AbstractListenerProviderRegistry<IntentDomainEvent, IntentDomainListener,
+ IntentDomainProvider, IntentDomainProviderService>
+ implements IntentDomainService, IntentDomainProviderRegistry {
private final Logger log = LoggerFactory.getLogger(getClass());
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected CoreService coreService;
-
- @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected NetworkConfigService configService;
-
- private NetworkConfigListener cfgListener = new InternalConfigListener();
-
private final ConcurrentMap<IntentDomainId, IntentDomain> domains = Maps.newConcurrentMap();
- private final Multimap<String, IntentDomainId> appToDomain =
- Multimaps.synchronizedSetMultimap(HashMultimap.<String, IntentDomainId>create());
-
- private Graph<DomainVertex, DomainEdge> graph;
-
@Activate
protected void activate() {
- configService.addListener(cfgListener);
- configService.getSubjects(IntentDomainId.class, IntentDomainConfig.class)
- .forEach(this::processConfig);
- graph = buildGraph();
- log.debug("Graph: {}", graph);
log.info("Started");
}
- private void processConfig(IntentDomainId intentDomainId) {
- IntentDomainConfig cfg = configService.getConfig(intentDomainId,
- IntentDomainConfig.class);
-
- domains.put(intentDomainId, createDomain(intentDomainId, cfg));
- appToDomain.put(cfg.applicationName(), intentDomainId);
- }
-
- private IntentDomain createDomain(IntentDomainId id, IntentDomainConfig cfg) {
- return new IntentDomain(id, cfg.domainName(), cfg.internalDevices(), cfg.edgePorts());
- }
-
- private Graph<DomainVertex, DomainEdge> buildGraph() {
- Set<DomainVertex> vertices = Sets.newHashSet();
- Set<DomainEdge> edges = Sets.newHashSet();
-
- Map<DeviceId, DomainVertex> deviceVertices = Maps.newHashMap();
- domains.forEach((id, domain) -> {
- DomainVertex domainVertex = new DomainVertex(id);
-
- // Add vertex for domain
- vertices.add(domainVertex);
-
- // Add vertices for connection devices
- domain.edgePorts().stream()
- .map(ConnectPoint::deviceId)
- .collect(Collectors.toSet())
- .forEach(did -> deviceVertices.putIfAbsent(did, new DomainVertex(did)));
-
- // Add bi-directional edges between each domain and connection device
- domain.edgePorts().forEach(cp -> {
- DomainVertex deviceVertex = deviceVertices.get(cp.deviceId());
- edges.add(new DomainEdge(domainVertex, deviceVertex, cp));
- edges.add(new DomainEdge(deviceVertex, domainVertex, cp));
- });
- });
-
- vertices.addAll(deviceVertices.values());
- //FIXME verify graph integrity...
- return new AdjacencyListsGraph<>(vertices, edges);
- }
-
@Deactivate
protected void deactivate() {
- configService.removeListener(cfgListener);
log.info("Stopped");
}
@@ -151,60 +82,34 @@
return domains.values().stream()
.filter(domain ->
domain.internalDevices().contains(deviceId) ||
- domain.edgePorts().stream()
- .map(ConnectPoint::deviceId)
- .anyMatch(d -> d.equals(deviceId)))
+ domain.edgePorts().stream()
+ .map(ConnectPoint::deviceId)
+ .anyMatch(d -> d.equals(deviceId)))
.collect(Collectors.toSet());
}
@Override
- public Graph<DomainVertex, DomainEdge> getDomainGraph() {
- return graph;
+ public List<IntentResource> request(IntentDomainId domainId, IntentPrimitive primitive) {
+ IntentDomain domain = getDomain(domainId);
+ return domain.provider().request(domain, primitive);
}
@Override
- public void addListener(IntentDomainListener listener) {
- //TODO slide in AbstractListenerManager
+ public void submit(IntentDomainId domainId, IntentResource resource) {
+ getDomain(domainId).provider().apply(resource);
}
@Override
- public void removeListener(IntentDomainListener listener) {
- //TODO slide in AbstractListenerManager
+ protected IntentDomainProviderService createProviderService(IntentDomainProvider provider) {
+ return new InternalDomainProviderService(provider);
}
- @Override
- public void registerApplication(ApplicationId applicationId, IntentDomainProvider provider) {
- appToDomain.get(applicationId.name()).forEach(d -> domains.get(d).setProvider(provider));
- }
+ private class InternalDomainProviderService
+ extends AbstractProviderService<IntentDomainProvider>
+ implements IntentDomainProviderService {
- @Override
- public void unregisterApplication(ApplicationId applicationId) {
- appToDomain.get(applicationId.name()).forEach(d -> domains.get(d).unsetProvider());
- }
-
- private class InternalConfigListener implements NetworkConfigListener {
- @Override
- public void event(NetworkConfigEvent event) {
- switch (event.type()) {
- case CONFIG_ADDED:
- case CONFIG_UPDATED:
- processConfig((IntentDomainId) event.subject());
- graph = buildGraph();
- log.debug("Graph: {}", graph);
- break;
-
- case CONFIG_REGISTERED:
- case CONFIG_UNREGISTERED:
- case CONFIG_REMOVED:
- default:
- //TODO
- break;
- }
- }
-
- @Override
- public boolean isRelevant(NetworkConfigEvent event) {
- return event.configClass().equals(IntentDomainConfig.class);
+ InternalDomainProviderService(IntentDomainProvider provider) {
+ super(provider);
}
}
}