diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2023-01-19 11:20:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-01-19 11:20:00 +0000 |
| commit | 5724464dad32a15ecb387e95e8ecdec5e7ad670d (patch) | |
| tree | 8753d83119d7ab2362ede3d4e195ed093c627be5 /bpmn/so-bpmn-infrastructure-common/src/main/groovy | |
| parent | d04f54dedba3e4ade3ac92282c1e3a408a29e70b (diff) | |
| parent | 3ac2c805850162882cea6e0fedaa2e2fce4aa8c2 (diff) | |
Merge "Support Activate,Deactivate and Terminate feature for NSMF based TN slices"
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-common/src/main/groovy')
3 files changed, 6 insertions, 3 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy index 2aaec9f164..42b36f9b0e 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy @@ -142,10 +142,10 @@ class DoActivateAccessNSSI extends AbstractServiceTaskProcessor { Map<String,ServiceInstance> relatedNssis = new HashMap<>() relatedNssis = getRelatedInstancesByRole(execution, ROLE_NSSI,KEY_NSSI, anNssiId) + execution.setVariable("relatedNssis", relatedNssis) if(relatedNssis.size() == 1) { execution.setVariable("IsRANNfAlonePresent", true) } - execution.setVariable("relatedNssis", relatedNssis) logger.trace("${Prefix} - Exit Get Related instances") } diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy index 74a2d980f7..5b65e08fe1 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy @@ -128,10 +128,10 @@ class DoDeAllocateAccessNSSI extends AbstractServiceTaskProcessor { Map<String,ServiceInstance> relatedNssis = new HashMap<>() relatedNssis = getRelatedInstancesByRole(execution, ROLE_NSSI, anNssiId) + execution.setVariable("relatedNssis", relatedNssis) if(relatedNssis.size() == 1) { execution.setVariable("IsRANNfAlonePresent", true) } - execution.setVariable("relatedNssis", relatedNssis) } diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeallocateNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeallocateNSSI.groovy index 554f7a6392..daf5f460d8 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeallocateNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeallocateNSSI.groovy @@ -104,7 +104,7 @@ class DoDeallocateNSSI extends AbstractServiceTaskProcessor try { ServiceDecomposition serviceDecomposition = execution.getVariable("serviceDecomposition") as ServiceDecomposition - String vendor = serviceDecomposition ?.getServiceRole() + String vendor = serviceDecomposition.getServiceRole() NetworkType domainType = convertServiceCategory(serviceDecomposition.getServiceCategory()) def currentNSSI = execution.getVariable("currentNSSI") @@ -138,6 +138,9 @@ class DoDeallocateNSSI extends AbstractServiceTaskProcessor if(serviceCategory ==~ /TN.*MH.*/){ return SubnetType.TN_MH.getNetworkType() } + if(serviceCategory ==~ /TN.*FH.*/){ + return SubnetType.TN_FH.getNetworkType() + } return null } |