Fixes #596 :Check for SFC virtual system list , before binding. Need…

… to have atleast one virtual system chained to sfc to bind
opensecuritycontroller · Nov 2, 2017 · e29ccd6 · e29ccd6
1 parent 7500b5a
commit e29ccd6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/...ver/src/main/java/org/osc/core/broker/service/securitygroup/BindSecurityGroupService.java b/...ver/src/main/java/org/osc/core/broker/service/securitygroup/BindSecurityGroupService.java
@@ -387,6 +387,11 @@ private ServiceFunctionChain validateAndLoadSfcBind(EntityManager em, BindSecuri
 		}
 
         List<Long> sfcVsIdList = sfc.getVirtualSystems().stream().map(vs -> vs.getId()).collect(Collectors.toList());
+        if (sfcVsIdList.isEmpty()) {
+            throw new VmidcBrokerValidationException(String.format(
+                    "Service Function Chain : %s has no Virtual System references, cannot be binded",
+                    sfc.getName()));
+        }
         List<Long> sfcVsIdOrderList = sfc.getVirtualSystems().stream().map(vs -> vs.getId()).collect(Collectors.toList());
 
         List<VirtualSystemPolicyBindingDto> servicesToBindTo = request.getServicesToBindTo();

diff --git a/osc-server/src/test/java/org/osc/core/broker/service/BindSecurityGroupServiceTest.java b/osc-server/src/test/java/org/osc/core/broker/service/BindSecurityGroupServiceTest.java
@@ -501,6 +501,30 @@ public void testValidate_WhenRequestSfcBindFlagIsFalseForVcOfTypeNeutronSfc_Thro
         this.bindSecurityGroupService.dispatch(request);
     }
 
+    @Test
+    public void testValidate_WhenSfcVirtualSystemListIsEmpty_ThrowsValidationException() throws Exception {
+        // Arrange
+        BindSecurityGroupRequest request = createRequest(VALID_ID, VALID_ID, VALID_ID);
+        ServiceFunctionChain sfc = createSFC(VALID_ID, VALID_ID);
+        List<VirtualSystem> vsList = new ArrayList<VirtualSystem>();
+        sfc.setVirtualSystems(vsList);
+        VirtualSystemPolicyBindingDto serviceToBindTo = createRequestWithService(INVALID_ID);
+        request.addServiceToBindTo(serviceToBindTo);
+        request.setBindSfc(true);
+
+        Mockito.when(this.em.find(Mockito.eq(VirtualizationConnector.class), Mockito.eq(VALID_ID)))
+                .thenReturn(VALID_SG.getVirtualizationConnector());
+        Mockito.when(this.em.find(Mockito.eq(ServiceFunctionChain.class), Mockito.eq(VALID_ID))).thenReturn(sfc);
+        Mockito.when(this.bindSecurityGroupService.apiFactoryService.supportsNeutronSFC(VALID_SG)).thenReturn(true);
+        this.exception.expect(VmidcBrokerValidationException.class);
+        this.exception.expectMessage(String.format(
+                "Cannot bind Service Function Chain : %s with empty Virtual System list",
+                sfc.getName()));
+
+        // Act
+        this.bindSecurityGroupService.dispatch(request);
+    }
+
     private static SecurityGroup createSecurityGroup(Long id, boolean markedFOrDeletion) {
         VirtualizationConnector vc = new VirtualizationConnector();
         vc.setId(id);