X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2Fso-bpmn-infrastructure-common%2Fsrc%2Fmain%2Fgroovy%2Forg%2Fonap%2Fso%2Fbpmn%2Finfrastructure%2Fscripts%2FDoDeallocateNSSI.groovy;h=daf5f460d8e4f76b846994260bff96e9a2859aa7;hb=3ac2c805850162882cea6e0fedaa2e2fce4aa8c2;hp=554f7a6392e94c5c65e50a80e0aadf73ddb7312d;hpb=11c4d0c6fdeff7e339025df7acb2e681e8cb6d89;p=so.git

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
     }