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

Merge branch '29-metrico-integration' into 'develop' 

Resolve "METRICO integration"

See merge request !20
parents 5b312a2d b06a9f79

src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java

+39 −28
Original line number Original line Diff line number Diff line
@@ -141,12 +141,8 @@ public class MetricoOrchestrationService implements JavaDelegate { 
			dataAccessEndpoints.add(dataAccessEndpoint);

			dataAccessEndpoints.add(dataAccessEndpoint);

			mcjFVO.setDataAccessEndpoint(dataAccessEndpoints);

			mcjFVO.setDataAccessEndpoint(dataAccessEndpoints);





			MeasurementCollectionJob mcj = serviceOrderManager.addMeasurementCollectionJob(mcjFVO);



			if  (mcj != null){



			ResourceSpecificationRef resourceSpecificationRef = spec.getResourceSpecification().stream().findFirst().get();

			ResourceSpecificationRef resourceSpecificationRef = spec.getResourceSpecification().stream().findFirst().get();

				Resource resourceMT = createRelatedResource( resourceSpecificationRef, sorder, aService, mcj );

			Resource resourceMT = createRelatedResource( resourceSpecificationRef, sorder, aService );

			ResourceRef resourceRef = new ResourceRef();

			ResourceRef resourceRef = new ResourceRef();





			resourceRef.setId( resourceMT.getId() );

			resourceRef.setId( resourceMT.getId() );
@@ -160,13 +156,28 @@ public class MetricoOrchestrationService implements JavaDelegate { 
			successNoteItem.setAuthor(compname);

			successNoteItem.setAuthor(compname);

			su.addNoteItem(successNoteItem);

			su.addNoteItem(successNoteItem);

			

			

            Service supd = serviceOrderManager.updateService(aService.getId(), su, false);//we nned first to create this in the db



            su = new ServiceUpdate();// the object to update the service

            MeasurementCollectionJob mcj = serviceOrderManager.addMeasurementCollectionJob(mcjFVO);

            if  (mcj != null){

              logger.info("Measurement Collection Job was not created.");



              serviceCharacteristic = new Characteristic();              

              serviceCharacteristic.setName( "_MT_MCJ_REFID" );

              serviceCharacteristic.setValueType( "TEXT" );

              Any val = new Any();

              val.setValue( mcj.getUuid() );

              val.setAlias( "" );              

              serviceCharacteristic.setValue(val);

              su.addServiceCharacteristicItem(serviceCharacteristic);

              

            } else {

            } else {

              logger.error("Measurement Collection Job was not created.");

              logger.error("Measurement Collection Job was not created.");

              su.setState(ServiceStateType.TERMINATED);

              su.setState(ServiceStateType.TERMINATED);

            }

            }





            Service supd = serviceOrderManager.updateService(aService.getId(), su, false);

            supd = serviceOrderManager.updateService(aService.getId(), su, false);//we nned first to create this in the db











		}

		}
@@ -233,7 +244,7 @@ public class MetricoOrchestrationService implements JavaDelegate { 
	 * @param aService

	 * @param aService

	 * @return

	 * @return

	 */

	 */

	private Resource createRelatedResource(ResourceSpecificationRef rSpecRef, ServiceOrder sOrder, Service aService, MeasurementCollectionJob mcj) {

	private Resource createRelatedResource(ResourceSpecificationRef rSpecRef, ServiceOrder sOrder, Service aService) {





		ResourceCreate resCreate = new ResourceCreate();

		ResourceCreate resCreate = new ResourceCreate();

		resCreate.setName(   rSpecRef.getName() + "-" + aService.getId() );

		resCreate.setName(   rSpecRef.getName() + "-" + aService.getId() );
@@ -251,8 +262,8 @@ public class MetricoOrchestrationService implements JavaDelegate { 
		resCharacteristicItem.setName( "_MT_MCJ_REF" );

		resCharacteristicItem.setName( "_MT_MCJ_REF" );

		resCharacteristicItem.setValueType( "TEXT" );

		resCharacteristicItem.setValueType( "TEXT" );

		Any val = new Any();

		Any val = new Any();

		val.setValue( mcj.getUuid() );

		val.setValue( "PENDING" );

		val.setAlias( mcj.getUuid() );

		val.setAlias( "PENDING" );

		resCharacteristicItem.setValue( val );

		resCharacteristicItem.setValue( val );

		resCreate.addResourceCharacteristicItem(  resCharacteristicItem );

		resCreate.addResourceCharacteristicItem(  resCharacteristicItem );