import org.opendaylight.transportpce.common.OperationResult;
import org.opendaylight.transportpce.servicehandler.service.ServiceDataStoreOperations;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.TopologyUpdateResult;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.TopologyUpdateResultBuilder;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.TransportpceNetworkmodelListener;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.topology.update.result.TopologyChanges;
import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.networkmodel.rev201116.topology.update.result.TopologyChangesKey;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev191129.AdminStates;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev190531.service.list.Services;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.AToZDirection;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.AToZDirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ZToADirection;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ZToADirectionBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.atoz.direction.AToZ;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.atoz.direction.AToZBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.atoz.direction.AToZKey;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ztoa.direction.ZToA;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ztoa.direction.ZToABuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.path.description.ztoa.direction.ZToAKey;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.pce.resource.Resource;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.pce.resource.ResourceBuilder;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev201210.pce.resource.resource.resource.TerminationPoint;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.path.PathDescription;
-import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev200128.service.path.PathDescriptionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.service.rev211210.service.list.Services;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirection;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirection;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirectionBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZ;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToA;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToABuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ztoa.direction.ZToAKey;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.Resource;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.ResourceBuilder;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.pce.resource.resource.resource.TerminationPoint;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.path.PathDescription;
+import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.service.types.rev220118.service.path.PathDescriptionBuilder;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.ServicePathList;
import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.servicepath.rev171017.service.path.list.ServicePaths;
import org.slf4j.Logger;
@Override
public void onTopologyUpdateResult(TopologyUpdateResult notification) {
- LOG.debug("Topology update notification: {}", notification.toString());
+ LOG.debug("Topology update notification: {}", notification);
if (compareTopologyUpdateResult(notification)) {
LOG.warn("TopologyUpdateResult already wired !");
return;
}
- topologyUpdateResult = notification;
+ topologyUpdateResult = new TopologyUpdateResultBuilder()
+ .setTopologyChanges(new HashMap<>(notification.getTopologyChanges()))
+ .build();
// Update service datastore and service path description
updateServicePaths(notification);
}
* Process topology update result.
* @param notification the result notification.
*/
- private void updateServicePaths(TopologyUpdateResult notification) {
+ protected void updateServicePaths(TopologyUpdateResult notification) {
@Nullable
Map<TopologyChangesKey, TopologyChanges> topologyChanges = notification.getTopologyChanges();
Optional<ServicePathList> servicePathListOptional = this.serviceDataStoreOperations.getServicePaths();
- ServicePathList servicePathList = null;
- if (!servicePathListOptional.isPresent()) {
+ if (servicePathListOptional.isEmpty()) {
LOG.warn("Enable to retrieve service path list");
return;
}
- servicePathList = servicePathListOptional.get();
+ ServicePathList servicePathList = servicePathListOptional.get();
for (ServicePaths servicePaths : servicePathList.getServicePaths().values()) {
String serviceName = servicePaths.getServicePathName();
PathDescription pathDescription = servicePaths.getPathDescription();
// update service in the datastore. Only path description with all elements in service can have a service
// in service. Therefore we check if all the states of the path description resources are inService
Optional<Services> serviceOptional = this.serviceDataStoreOperations.getService(serviceName);
- Services services = null;
- if (!serviceOptional.isPresent()) {
+ if (serviceOptional.isEmpty()) {
LOG.error("Couldn't retrieve service");
continue;
}
- services = serviceOptional.get();
+ Services services = serviceOptional.get();
OperationResult operationResult1 = null;
- if (org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State.InService
- .equals(services.getOperationalState())
- && !allElementsinPathinService(updatedAtoZ, updatedZtoA)) {
- LOG.debug("Service={} needs to be updated to outOfService", serviceName);
- operationResult1 = this.serviceDataStoreOperations.modifyService(serviceName, State.OutOfService,
- AdminStates.OutOfService);
- } else if (org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.State.OutOfService
- .equals(services.getOperationalState())
- && allElementsinPathinService(updatedAtoZ, updatedZtoA)) {
- LOG.debug("Service={} needs to be updated to inService", serviceName);
- operationResult1 = this.serviceDataStoreOperations.modifyService(serviceName, State.InService,
- AdminStates.InService);
- } else {
- LOG.debug("Service {} state doesnt need to be modified", serviceName);
+ State newState;
+ switch (services.getOperationalState()) {
+ case InService:
+ if (allElementsinPathinService(updatedAtoZ, updatedZtoA)) {
+ LOG.debug("Service {} state does not need to be modified", serviceName);
+ continue;
+ }
+ newState = State.OutOfService;
+ break;
+ case OutOfService:
+ if (!allElementsinPathinService(updatedAtoZ, updatedZtoA)) {
+ LOG.debug("Service {} state does not need to be modified", serviceName);
+ continue;
+ }
+ newState = State.InService;
+ break;
+ default:
+ LOG.warn("Service {} state not managed", serviceName);
+ continue;
}
- if (operationResult1 != null && operationResult1.isSuccess()) {
- LOG.info("Service state of {} correctly updated in datastore", serviceName);
+
+
+ LOG.debug("Service={} needs to be updated to {}", serviceName, newState);
+ //if (operationResult1 != null && operationResult1.isSuccess()) {
+ //null check probably no more needed
+ if (this.serviceDataStoreOperations
+ .modifyService(serviceName, newState, services.getAdministrativeState())
+ .isSuccess()) {
+ LOG.info("Service state of {} correctly updated to {} in datastore", serviceName, newState);
+ continue;
}
+ LOG.error("Service state of {} cannot be updated to {} in datastore", serviceName, newState);
+
}
}
- private Map<ZToAKey, ZToA> changePathElementStateZA(Map<TopologyChangesKey, TopologyChanges> topologyChanges,
+ protected Map<ZToAKey, ZToA> changePathElementStateZA(Map<TopologyChangesKey, TopologyChanges> topologyChanges,
PathDescription pathDescription) {
-
Map<ZToAKey, ZToA> newztoaMap = new HashMap<>(pathDescription.getZToADirection().getZToA());
List<ZToA> tpResources = pathDescription.getZToADirection().getZToA().values().stream()
- .filter(ele -> ele.getResource().getResource().implementedInterface().getSimpleName()
- .equals("TerminationPoint"))
- .collect(Collectors.toList());
+ .filter(ele -> ele.getResource().getResource() instanceof TerminationPoint)
+ .collect(Collectors.toList());
for (ZToA ztoA : tpResources) {
String ztoAid = ztoA.getId();
State ztoAState = ztoA.getResource().getState();
return newztoaMap;
}
- pr
ivate Map<AToZKey, AToZ> changePathElementStateAZ(Map<TopologyChangesKey,
+ pr
otected Map<AToZKey, AToZ> changePathElementStateAZ(Map<TopologyChangesKey,
TopologyChanges> topologyChanges, PathDescription pathDescription) {
Map<AToZKey, AToZ> newatozMap = new HashMap<>(pathDescription.getAToZDirection().getAToZ());
List<AToZ> tpResources = pathDescription.getAToZDirection().getAToZ().values().stream()
- .filter(ele -> ele.getResource().getResource().implementedInterface().getSimpleName()
- .equals("TerminationPoint"))
+ .filter(ele -> ele.getResource().getResource() instanceof TerminationPoint)
.collect(Collectors.toList());
for (AToZ atoZ : tpResources) {
String atoZid = atoZ.getId();
.build();
}
- pr
ivate boolean allElementsinPathinService(Map<AToZKey, AToZ> updatedAtoZ, Map<ZToAKey, ZToA> updatedZtoA) {
+ pr
otected boolean allElementsinPathinService(Map<AToZKey, AToZ> updatedAtoZ, Map<ZToAKey, ZToA> updatedZtoA) {
boolean allEleminService = true;
Iterator<AToZ> i1 = updatedAtoZ.values().iterator();
Iterator<ZToA> i2 = updatedZtoA.values().iterator();
}
private boolean compareTopologyUpdateResult(TopologyUpdateResult notification) {
- if (topologyUpdateResult == null) {
- return false;
- }
- if (topologyUpdateResult.getTopologyChanges().values()
- .equals(notification.getTopologyChanges().values())) {
- return false;
- }
- return true;
+ return topologyUpdateResult != null
+ && topologyUpdateResult.getTopologyChanges().equals(notification.getTopologyChanges());
}
public void setserviceDataStoreOperations(ServiceDataStoreOperations serviceData) {
Code Review / transportpce.git / blobdiff