Updated Branches: refs/heads/ui-vpc-redesign ccf1ebc26 -> 75df90663
CLOUDSTACK-747: internalLb in VPC - UI - create network offering - when Lb service is checked and LB provider is InternalLbVm, pass capability type as lbSchemes and capability value as internal. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/75df9066 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/75df9066 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/75df9066 Branch: refs/heads/ui-vpc-redesign Commit: 75df90663f72bb0b8c9c8de84de8684cb96a1ba6 Parents: ccf1ebc Author: Jessica Wang <jessicaw...@apache.org> Authored: Tue May 21 11:37:12 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Tue May 21 11:37:12 2013 -0700 ---------------------------------------------------------------------- ui/scripts/configuration.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75df9066/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 7485898..92c3d00 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1834,7 +1834,13 @@ inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'associatePublicIP'; inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = true; //because this checkbox's value == "on" serviceCapabilityIndex++; - } + } + else if((key == 'service.Lb.provider') && ("Lb" in serviceProviderMap) && (serviceProviderMap.Lb == "InternalLbVm")) { + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].service'] = 'lb'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilitytype'] = 'lbSchemes'; + inputData['servicecapabilitylist[' + serviceCapabilityIndex + '].capabilityvalue'] = 'internal'; + serviceCapabilityIndex++; + } } else if (value != '') { // Normal data inputData[key] = value;
