Commit b2b16ca1 authored by George Tziavas's avatar George Tziavas
Browse files

Merge branch 'develop' into 29-metrico-integration

parents 1d4f8224 7ca7331d

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

+2 −1
Original line number Diff line number Diff line
@@ -91,13 +91,14 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate { 
            Service serviceResult = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO );

            return;

          }

         

          rlist.add(res);

          

        }

        @Valid

        ServiceStateType currentState = aService.getState();        

        

	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);

	    ServiceStateType nextState =  aService.findNextStateBasedOnResourceList(rlist);

	    

	    if (!currentState.equals(nextState)) {

	        supd.setState( nextState );

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

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class GCOrchestrationCheckDeploymentService implements JavaDelegate { 
        @Valid

        ServiceStateType currentState = aService.getState();        

        

	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);

	    ServiceStateType nextState = aService.findNextStateBasedOnResourceList(rlist);

	    

	    if (!currentState.equals(nextState)) {

	        supd.setState( nextState );

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

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ public class ProcessCreateServiceRules implements JavaDelegate { 
			return;

		}

		

		if ( spec == null) {

          logger.debug("\tCannot retrieve ServiceSpec:" + contextServiceSpecId);

		  return;

		}

		



		/*

		 * first find all referenced ServiceSpecs of a ServiceSpec to be created

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

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ public class ProcessOrderItemActionCheck implements JavaDelegate { 
		ServiceOrder sor = serviceOrderManager.retrieveServiceOrder((String) execution.getVariable("orderid"));

		String orderItemIdToProcess = (String) execution.getVariable("orderItemId");

		ServiceOrderItem soi = null;

        execution.setVariable("saction", "NONE");            

		

		for (ServiceOrderItem i : sor.getOrderItem()) {

			if (i.getUuid().equals( orderItemIdToProcess )){
@@ -46,7 +47,6 @@ public class ProcessOrderItemActionCheck implements JavaDelegate { 
            logger.error("In ProcessOrderItemActionCheck cannot find ServiceOrderItem orderItemIdToProcess=:" + orderItemIdToProcess);

            logger.error("In ProcessOrderItemActionCheck cannot find ServiceOrderItem sor.getUuid()=:" + sor.getUuid() );

            logger.error("In ProcessOrderItemActionCheck cannot find ServiceOrderItem sor()=:" + sor.toString() );

            execution.setVariable("saction", "NONE");            

			return;

		}

src/main/resources/processes/ProcessOrderItemProcess.bpmn

+13 −1
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
    <sequenceFlow id="flow30" sourceRef="stActionDELETE" targetRef="stProcesOrderItemComplete"></sequenceFlow>

    <sequenceFlow id="flow31" sourceRef="stProcesOrderItemComplete" targetRef="endevent2"></sequenceFlow>

    <sequenceFlow id="flow32" sourceRef="stActionADD" targetRef="CreateServiceProcess"></sequenceFlow>

    <sequenceFlow id="flow33" name="saction=='NONE'" sourceRef="exclusivegateway1" targetRef="endevent2">

      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${saction=='NONE'}]]></conditionExpression>

    </sequenceFlow>

  </process>

  <bpmndi:BPMNDiagram id="BPMNDiagram_ProcessOrderItem">

    <bpmndi:BPMNPlane bpmnElement="ProcessOrderItem" id="BPMNPlane_ProcessOrderItem">
@@ -85,7 +88,7 @@ 
        <omgdi:waypoint x="320.0" y="367.0"></omgdi:waypoint>

        <omgdi:waypoint x="464.0" y="367.0"></omgdi:waypoint>

        <bpmndi:BPMNLabel>

          <omgdc:Bounds height="14.0" width="88.0" x="340.0" y="339.0"></omgdc:Bounds>

          <omgdc:Bounds height="14.0" width="100.0" x="340.0" y="339.0"></omgdc:Bounds>

        </bpmndi:BPMNLabel>

      </bpmndi:BPMNEdge>

      <bpmndi:BPMNEdge bpmnElement="flow28" id="BPMNEdge_flow28">
@@ -111,6 +114,15 @@ 
        <omgdi:waypoint x="515.0" y="87.0"></omgdi:waypoint>

        <omgdi:waypoint x="560.0" y="87.0"></omgdi:waypoint>

      </bpmndi:BPMNEdge>

      <bpmndi:BPMNEdge bpmnElement="flow33" id="BPMNEdge_flow33">

        <omgdi:waypoint x="320.0" y="197.0"></omgdi:waypoint>

        <omgdi:waypoint x="319.0" y="467.0"></omgdi:waypoint>

        <omgdi:waypoint x="867.0" y="467.0"></omgdi:waypoint>

        <omgdi:waypoint x="867.0" y="191.0"></omgdi:waypoint>

        <bpmndi:BPMNLabel>

          <omgdc:Bounds height="14.0" width="100.0" x="335.0" y="449.0"></omgdc:Bounds>

        </bpmndi:BPMNLabel>

      </bpmndi:BPMNEdge>

    </bpmndi:BPMNPlane>

  </bpmndi:BPMNDiagram>

</definitions>
 
 No newline at end of file