From df6172f93846455bb3eba2930bdfcce52dc21104 Mon Sep 17 00:00:00 2001 From: Sachchidanand Vaidya Date: Wed, 2 Apr 2014 01:57:07 -0700 Subject: [PATCH] CLOUDSTACK-6322 - Don't allow service instance creation with empty or null service-instance "name". Signed-off-by: Daan Hoogland (cherry picked from commit 085911f0a6c256c5f2a439ec0bf79b5027cdc078) Signed-off-by: Rohit Yadav Conflicts: plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java --- .../contrail/api/command/CreateServiceInstanceCmd.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java index 62ab317ed30..9d0e942bd0e 100644 --- a/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java +++ b/plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/api/command/CreateServiceInstanceCmd.java @@ -90,7 +90,8 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { description = "The service offering ID that defines the resources consumed by the service appliance") private Long serviceOfferingId; - @Parameter(name = ApiConstants.NAME, type = CommandType.STRING) + @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, + required = true, description = "The name of the service instance") private String name; /// Implementation @@ -126,6 +127,10 @@ public class CreateServiceInstanceCmd extends BaseAsyncCreateCmd { throw new InvalidParameterValueException("Invalid ID for right network " + rightNetworkId); } + if (name.isEmpty()) { + throw new InvalidParameterValueException("service instance name is empty"); + } + ServiceVirtualMachine svm = _vrouterService.createServiceInstance(zone, owner, template, serviceOffering, name, left, right); if (svm == null) {