Commit e444ed1b authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '106-update-the-api-to-address-the-new-resource-state-model' into 'develop'

Resolve "Update the API to address the new resource state model"

See merge request !110
parents b5b0d74c 3827f47f
Loading
Loading
Loading
Loading
Loading
+3 −2
Changes for src/main/java/org/etsi/osl/tmf/ri639/repo/ResourceRepository.java: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -40,10 +40,11 @@ public interface ResourceRepository extends JpaRepository<Resource, Long> {
	Iterable<Resource> findByRolename(String name);


	@Query("SELECT srv FROM RIResource srv  WHERE srv.resourceStatus = org.etsi.osl.tmf.ri639.model.ResourceStatusType.AVAILABLE AND "
			+ "srv.endOperatingDate < CURRENT_TIMESTAMP")
	@Query("SELECT srv FROM RIResource srv WHERE srv.endOperatingDate < CURRENT_TIMESTAMP AND "
			+ "(srv.administrativeState IS NULL OR srv.administrativeState <> org.etsi.osl.tmf.ri639.model.ResourceAdministrativeStateType.SHUTDOWN)")
	List<Resource> findActiveToTerminate();
	

	@Query("SELECT srv FROM RIResource srv "
			+ "JOIN FETCH srv.resourceCharacteristic char "
			+ "JOIN FETCH char.value val "
+13 −2
Changes for src/main/java/org/etsi/osl/tmf/ri639/reposervices/ResourceRepoService.java: 13 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ public class ResourceRepoService {
      resource.setUsageState(resourceUpd.getUsageState());
    }

    // A state change is any change to what the resource reports about itself: its inventory status,
    // or either of the ITU-T X.731 attributes the supported service derives its own state from.
    // Missing operational/administrative state here would leave a health change unannounced.
    boolean resourceStateChanged = false;
    if (resourceUpd.getResourceStatus() != null) {
      if (!resourceUpd.getResourceStatus().equals(resource.getResourceStatus())) {
@@ -343,13 +346,18 @@ public class ResourceRepoService {
      resource.setResourceVersion(resourceUpd.getResourceVersion());
    }
    if (resourceUpd.getOperationalState() != null) {
      if (!resourceUpd.getOperationalState().equals(resource.getOperationalState())) {
        resourceStateChanged = true;
      }
      resource.setOperationalState(resourceUpd.getOperationalState());
    }
    if (resourceUpd.getAdministrativeState() != null) {
      if (!resourceUpd.getAdministrativeState().equals(resource.getAdministrativeState())) {
        resourceStateChanged = true;
      }
      resource.setAdministrativeState(resourceUpd.getAdministrativeState());
    }


    if (resourceUpd.getResourceSpecification() != null) {
      resource.setResourceSpecification(resourceUpd.getResourceSpecification());
    }
@@ -415,7 +423,10 @@ public class ResourceRepoService {
    
    if (resourceStateChanged) {
      Note n = new Note();
      n.setText("Resource resourceStateChanged changed to " + resource.getResourceStatus().toString() );
      n.setText("Resource state changed to resourceStatus=" + resource.getResourceStatus()
          + " operationalState=" + resource.getOperationalState()
          + " administrativeState=" + resource.getAdministrativeState()
          + " (health=" + resource.deriveHealth() + ")");
      n.setAuthor( "RI639-API" );
      n.setDate( OffsetDateTime.now(ZoneOffset.UTC).toString() );
      resource.addNoteItem( n );                  
+1 −9
Changes for src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java: 1 added line, 9 removed lines.
Original line number Diff line number Diff line
@@ -1121,10 +1121,6 @@ public class ServiceRepoService {
	public void  updateServicesHavingThisSupportingResource(@Valid Resource res) {
      try {
        
        if (res.getResourceStatus()==null){
          logger.debug("================> updateServicesHavingThisSupportingResource resource status NULL");     
          return;
        }
        
        logger.debug("================> Will update services related to this resource with id = " + res.getId() );        
        var aservices = findServicesHavingThisSupportingResourceID(  res.getId() );
@@ -1143,10 +1139,6 @@ public class ServiceRepoService {
                  Optional<Resource> result = resourceRepo.findByUuid(rref.getId());
                  if (result.isPresent()) {
                    rlist.add( result.get() );
                    if ( result.get().getResourceStatus()==null){
                      logger.debug("================> updateServicesHavingThisSupportingResource resource status NULL for resource: "+ result.get().getName()  );     
                      return;
                    }
                  }                  
                }
              }
@@ -1172,7 +1164,7 @@ public class ServiceRepoService {
                logger.debug("====================>  stateText = " + stateText);
              }
              for (Resource r : rlist) {
                logger.debug("==================> state: ="+  r.getResourceStatus().name() + ", "+  r.getName() );
                logger.debug("==================> health: =" +  r.deriveHealth() + ", " +  r.getName() );
                
              }
              
+12 −3
Changes for src/test/java/org/etsi/osl/services/api/ResourceInventoryIntegrationTest.java: 12 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -268,7 +268,10 @@ public class ResourceInventoryIntegrationTest extends BaseIT {
		assertThat( resourceRepoService.findAll().size() ).isEqualTo( 2 );

		assertThat( responseRes2.getEndOperatingDate() ).isNotNull();
		assertThat( responseRes2.getNote().size()  ).isEqualTo( 4 );
		// 5 notes: the 2 the resource was created with, "test note2", the characteristic-change
		// note, and the state-change note - the patch sets operationalState on a resource that had
		// none, and a health change is now announced the same way a resourceStatus change is.
		assertThat( responseRes2.getNote().size()  ).isEqualTo( 5 );
		assertThat( responseRes2.getResourceCharacteristic().size()  ).isEqualTo( 2 );
		assertThat( responseRes2.getResourceCharacteristicByName( "ConfigStatus" ).getValue().getValue()  ).isEqualTo( "RUNNING" )  ;
		assertThat( responseRes2.getResourceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue()  ).isEqualTo( "007a008" )  ;
@@ -294,7 +297,10 @@ public class ResourceInventoryIntegrationTest extends BaseIT {
		assertThat( resourceRepoService.findAll().size() ).isEqualTo( 2 );

		assertThat( responseRes2.getEndOperatingDate() ).isNotNull();
		assertThat( responseRes2.getNote().size()  ).isEqualTo( 4 );
		// 5 notes: the 2 the resource was created with, "test note2", the characteristic-change
		// note, and the state-change note - the patch sets operationalState on a resource that had
		// none, and a health change is now announced the same way a resourceStatus change is.
		assertThat( responseRes2.getNote().size()  ).isEqualTo( 5 );
		assertThat( responseRes2.getResourceCharacteristic().size()  ).isEqualTo( 2 );
		assertThat( responseRes2.getResourceCharacteristicByName( "ConfigStatus" ).getValue().getValue()  ).isEqualTo( "RUNNING" )  ;
		assertThat( responseRes2.getResourceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue()  ).isEqualTo( "007a008" )  ;
@@ -495,7 +501,10 @@ public class ResourceInventoryIntegrationTest extends BaseIT {
        assertThat( resourceRepoService.findAll().size() ).isEqualTo( 4 );

        assertThat( responseRes2.getEndOperatingDate() ).isNotNull();
        assertThat( responseRes2.getNote().size()  ).isEqualTo( 4 );
        // 5 notes: the 2 the resource was created with, "test note2", the characteristic-change
        // note, and the state-change note - the patch sets operationalState on a resource that had
        // none, and a health change is now announced the same way a resourceStatus change is.
        assertThat( responseRes2.getNote().size()  ).isEqualTo( 5 );
        assertThat( responseRes2.getResourceCharacteristic().size()  ).isEqualTo( 2 );
        assertThat( responseRes2.getResourceCharacteristicByName( "ConfigStatus" ).getValue().getValue()  ).isEqualTo( "RUNNING" )  ;
        assertThat( responseRes2.getResourceCharacteristicByName( "DeploymentRequestID" ).getValue().getValue()  ).isEqualTo( "007a008" )  ;
+53 −9
Changes for src/test/java/org/etsi/osl/services/api/sim638/ServiceRepoServiceTest.java: 53 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ import org.etsi.osl.tmf.rcm634.model.LogicalResourceSpecification;
import org.etsi.osl.tmf.rcm634.model.LogicalResourceSpecificationCreate;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef;
import org.etsi.osl.tmf.ri639.model.Resource;
import org.etsi.osl.tmf.ri639.model.ResourceAdministrativeStateType;
import org.etsi.osl.tmf.ri639.model.ResourceOperationalStateType;
import org.etsi.osl.tmf.ri639.model.ResourceCreate;
import org.etsi.osl.tmf.ri639.model.ResourceHealth;
import org.etsi.osl.tmf.ri639.model.ResourceStateChangeEvent;
import org.etsi.osl.tmf.ri639.model.ResourceStateChangeNotification;
import org.etsi.osl.tmf.ri639.model.ResourceStatusType;
@@ -261,7 +264,9 @@ public class ServiceRepoServiceTest extends BaseIT {
        ResourceRef firstResourceRef = resourceRefList.get(0);

        Resource resource = resourceRepoService.findByUuid(firstResourceRef.getId());
        // Pool bookkeeping alone no longer moves the service - the resource has to declare its health.
        resource.setResourceStatus(ResourceStatusType.STANDBY);
        resource.applyHealth(ResourceHealth.DOWN);

        ResourceStateChangeNotification resourceCreateNotification = new ResourceStateChangeNotification();
        ResourceStateChangeEvent event = new ResourceStateChangeEvent();
@@ -491,36 +496,75 @@ public class ServiceRepoServiceTest extends BaseIT {
      List<Resource> rlist = new ArrayList<Resource>();
      Resource r1 = new Resource();
      Resource r2 = new Resource();
      r1.setResourceStatus(ResourceStatusType.RESERVED);
      r2.setResourceStatus(ResourceStatusType.RESERVED);

      // Both resources are still being brought up: nothing is known about their health yet, and the
      // service must not be promoted on the absence of evidence.
      rlist.add(r1);
      rlist.add(r2);
      ServiceStateType nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.RESERVED );

      r1.setResourceStatus(ResourceStatusType.AVAILABLE);
      // One resource up is not enough.
      setHealth(r1, ResourceOperationalStateType.ENABLE, ResourceAdministrativeStateType.UNLOCKED);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.RESERVED );

      r2.setResourceStatus(ResourceStatusType.AVAILABLE);
      // Both up: the service goes live.
      setHealth(r2, ResourceOperationalStateType.ENABLE, ResourceAdministrativeStateType.UNLOCKED);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.ACTIVE );

      s.setState( ServiceStateType.ACTIVE ); 
      r1.setResourceStatus(ResourceStatusType.UNKNOWN);
      // Inventory bookkeeping says nothing about health: a booked (RESERVED) resource that reports
      // ENABLE/UNLOCKED keeps the service ACTIVE, and a pooled (AVAILABLE) one does not rescue it.
      r1.setResourceStatus(ResourceStatusType.RESERVED);
      r2.setResourceStatus(ResourceStatusType.RESERVED);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.ACTIVE );

      r1.setResourceStatus(ResourceStatusType.SUSPENDED);
      // A resource that stops reporting its health does not knock a running service out.
      s.setState( ServiceStateType.ACTIVE );
      setHealth(r1, null, null);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.ACTIVE );

      s.setState( ServiceStateType.TERMINATED ); 
      r1.setResourceStatus(ResourceStatusType.AVAILABLE);
      // A resource that is genuinely broken does.
      setHealth(r1, ResourceOperationalStateType.DISABLE, ResourceAdministrativeStateType.UNLOCKED);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.INACTIVE );

      // So does one that is administratively barred.
      setHealth(r1, ResourceOperationalStateType.ENABLE, ResourceAdministrativeStateType.LOCKED);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.INACTIVE );

      // Partial teardown is not a teardown.
      s.setState( ServiceStateType.ACTIVE );
      setHealth(r1, ResourceOperationalStateType.DISABLE, ResourceAdministrativeStateType.SHUTDOWN);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.INACTIVE );

      // Every resource torn down terminates the service.
      setHealth(r2, ResourceOperationalStateType.DISABLE, ResourceAdministrativeStateType.SHUTDOWN);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.TERMINATED );

      // Nothing to judge leaves the state alone.
      s.setState( ServiceStateType.RESERVED );
      assertThat( s.findNextStateBasedOnResourceList(new ArrayList<Resource>()) )
          .isEqualTo( ServiceStateType.RESERVED );

      // TERMINATED is absorbing.
      s.setState( ServiceStateType.TERMINATED );
      setHealth(r1, ResourceOperationalStateType.ENABLE, ResourceAdministrativeStateType.UNLOCKED);
      setHealth(r2, ResourceOperationalStateType.ENABLE, ResourceAdministrativeStateType.UNLOCKED);
      nstate = s.findNextStateBasedOnResourceList(rlist);
      assertThat(nstate).isEqualTo( ServiceStateType.TERMINATED );
    }

    private static void setHealth(Resource r, ResourceOperationalStateType op,
        ResourceAdministrativeStateType admin) {
      r.setOperationalState(op);
      r.setAdministrativeState(admin);
    }

    private ServiceSpecification createServiceSpec(String sspectext, ServiceSpecificationCreate sspeccr1) throws Exception{