diff options
| author |   sr20255772 <sravya.sherla@wipro.com> | 2022-11-28 12:28:40 +0000 |
|---|---|---|
| committer |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2022-12-12 15:42:23 +0000 |
| commit | 3ac2c805850162882cea6e0fedaa2e2fce4aa8c2 (patch) | |
| tree | 09e5faf4c76a254edaa78dca8a88d762339caaa3 /bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap | |
| parent | 11c4d0c6fdeff7e339025df7acb2e681e8cb6d89 (diff) | |
Support Activate,Deactivate and Terminate feature for NSMF based TN slices
Issue-ID: SO-4029
Signed-off-by: sr20255772 <sravya.sherla@wipro.com>
Change-Id: I97f0c610c55fb19fbcd0f9ae441b6826800820ab
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap')
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 } |