@@ -168,10 +168,7 @@ public LoadBalancerConfig createLoadBalancerConfig(CreateLoadBalancerConfigCmd c
168168 if (scope == null ) {
169169 throw new InvalidParameterValueException ("Invalid scope " + scopeStr );
170170 }
171- Pair <LoadBalancerConfigKey , String > res = LoadBalancerConfigKey .validate (scope , name , value );
172- if (res .second () != null ) {
173- throw new InvalidParameterValueException (res .second ());
174- }
171+ LoadBalancerConfigKey configKey = validateParameters (scope , name , value );
175172
176173 checkPermission (scope , networkId , vpcId , loadBalancerId );
177174
@@ -182,7 +179,7 @@ public LoadBalancerConfig createLoadBalancerConfig(CreateLoadBalancerConfigCmd c
182179 } else {
183180 throw new InvalidParameterValueException ("config " + name + " already exists, please add forced=true or update it instead" ); }
184181 }
185- LoadBalancerConfigVO config = _lbConfigDao .persist (new LoadBalancerConfigVO (scope , networkId , vpcId , loadBalancerId , res . first () , value ));
182+ LoadBalancerConfigVO config = _lbConfigDao .persist (new LoadBalancerConfigVO (scope , networkId , vpcId , loadBalancerId , configKey , value ));
186183
187184 applyLbConfigsForNetwork (config .getNetworkId (), config .getVpcId (), config .getLoadBalancerId ());
188185
@@ -215,10 +212,7 @@ public LoadBalancerConfig updateLoadBalancerConfig(UpdateLoadBalancerConfigCmd c
215212 throw new InvalidParameterValueException ("Cannot find load balancer config by id " + id );
216213 }
217214 //validate parameters
218- Pair <LoadBalancerConfigKey , String > res = LoadBalancerConfigKey .validate (config .getScope (), config .getName (), value );
219- if (res .second () != null ) {
220- throw new InvalidParameterValueException (res .second ());
221- }
215+ LoadBalancerConfigKey configKey = validateParameters (config .getScope (), config .getName (), value );
222216
223217 checkPermission (config );
224218 config .setValue (value );
@@ -246,26 +240,31 @@ public List<? extends LoadBalancerConfig> replaceLoadBalancerConfigs(ReplaceLoad
246240 if (scope == null ) {
247241 throw new InvalidParameterValueException ("Invalid scope " + scopeStr );
248242 }
249- checkPermission (scope , networkId , vpcId , loadBalancerId );
250-
251243 List <LoadBalancerConfigVO > configs = new ArrayList <LoadBalancerConfigVO >();
252244 for (Object obj : configList .keySet ()) {
253245 String name = String .valueOf (obj );
254246 String value = (String ) configList .get (name );
255- Pair <LoadBalancerConfigKey , String > res = LoadBalancerConfigKey .validate (scope , name , value );
256- if (res .second () != null ) {
257- throw new InvalidParameterValueException (res .second ());
258- }
259- configs .add (new LoadBalancerConfigVO (scope , networkId , vpcId , loadBalancerId , res .first (), value ));
247+ LoadBalancerConfigKey configKey = validateParameters (scope , name , value );
248+ configs .add (new LoadBalancerConfigVO (scope , networkId , vpcId , loadBalancerId , configKey , value ));
260249 }
261250
251+ checkPermission (scope , networkId , vpcId , loadBalancerId );
252+
262253 configs = _lbConfigDao .saveConfigs (configs );
263254
264255 applyLbConfigsForNetwork (networkId , vpcId , loadBalancerId );
265256
266257 return configs ;
267258 }
268259
260+ private LoadBalancerConfigKey validateParameters (Scope scope , String name , String value ) {
261+ Pair <LoadBalancerConfigKey , String > res = LoadBalancerConfigKey .validate (scope , name , value );
262+ if (res .second () != null ) {
263+ throw new InvalidParameterValueException (res .second ());
264+ }
265+ return res .first ();
266+ }
267+
269268 private void checkPermission (LoadBalancerConfigVO config ) {
270269 checkPermission (config .getScope (), config .getNetworkId (), config .getVpcId (), config .getLoadBalancerId ());
271270 }
0 commit comments