Skip to content
Snippets Groups Projects
Commit 1c81297e authored by tranoris's avatar tranoris
Browse files

fix for creation order

parent 3e2d403a
No related branches found
No related tags found
2 merge requests!22MR for Release 2024Q4,!20Resolve "METRICO integration"
...@@ -141,32 +141,43 @@ public class MetricoOrchestrationService implements JavaDelegate { ...@@ -141,32 +141,43 @@ public class MetricoOrchestrationService implements JavaDelegate {
dataAccessEndpoints.add(dataAccessEndpoint); dataAccessEndpoints.add(dataAccessEndpoint);
mcjFVO.setDataAccessEndpoint(dataAccessEndpoints); mcjFVO.setDataAccessEndpoint(dataAccessEndpoints);
MeasurementCollectionJob mcj = serviceOrderManager.addMeasurementCollectionJob(mcjFVO); ResourceSpecificationRef resourceSpecificationRef = spec.getResourceSpecification().stream().findFirst().get();
Resource resourceMT = createRelatedResource( resourceSpecificationRef, sorder, aService );
if (mcj != null){ ResourceRef resourceRef = new ResourceRef();
ResourceSpecificationRef resourceSpecificationRef = spec.getResourceSpecification().stream().findFirst().get(); resourceRef.setId( resourceMT.getId() );
Resource resourceMT = createRelatedResource( resourceSpecificationRef, sorder, aService, mcj ); resourceRef.setName( resourceMT.getName());
ResourceRef resourceRef = new ResourceRef(); resourceRef.setType( resourceMT.getType());
su.addSupportingResourceItem( resourceRef );
resourceRef.setId( resourceMT.getId() ); su.setState(ServiceStateType.RESERVED);
resourceRef.setName( resourceMT.getName()); Note successNoteItem = new Note();
resourceRef.setType( resourceMT.getType()); successNoteItem.setText(String.format("Requesting METRICO to create a new monitoring job"));
su.addSupportingResourceItem( resourceRef ); successNoteItem.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());
su.setState(ServiceStateType.RESERVED); successNoteItem.setAuthor(compname);
Note successNoteItem = new Note(); su.addNoteItem(successNoteItem);
successNoteItem.setText(String.format("Requesting METRICO to create a new monitoring job"));
successNoteItem.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString()); Service supd = serviceOrderManager.updateService(aService.getId(), su, false);//we nned first to create this in the db
successNoteItem.setAuthor(compname);
su.addNoteItem(successNoteItem); su = new ServiceUpdate();// the object to update the service
MeasurementCollectionJob mcj = serviceOrderManager.addMeasurementCollectionJob(mcjFVO);
} else { if (mcj != null){
logger.error("Measurement Collection Job was not created."); logger.info("Measurement Collection Job was not created.");
su.setState(ServiceStateType.TERMINATED);
} serviceCharacteristic = new Characteristic();
serviceCharacteristic.setName( "_MT_MCJ_REFID" );
Service supd = serviceOrderManager.updateService(aService.getId(), su, false); serviceCharacteristic.setValueType( "TEXT" );
Any val = new Any();
val.setValue( mcj.getUuid() );
val.setAlias( "" );
serviceCharacteristic.setValue(val);
su.addServiceCharacteristicItem(serviceCharacteristic);
} else {
logger.error("Measurement Collection Job was not created.");
su.setState(ServiceStateType.TERMINATED);
}
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 { ...@@ -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 { ...@@ -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 );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment