You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/05/21 21:34:47 UTC
[49/50] [abbrv] git commit: updated refs/heads/ui-vpc-redesign to
e35f144
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/a75cf9a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a75cf9a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a75cf9a7
Branch: refs/heads/ui-vpc-redesign
Commit: a75cf9a79d9f3f3c6c399b03e73362523e3d815a
Parents: 263cc9a
Author: Jessica Wang <je...@apache.org>
Authored: Tue May 21 11:37:12 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Tue May 21 11:44:50 2013 -0700
----------------------------------------------------------------------
ui/scripts/configuration.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a75cf9a7/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;