CS-16209,CS-16262:AutoScale server side changes for Supporting network element independent counter parameters in AutoScaleVmProfile
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8d5c78e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8d5c78e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8d5c78e3 Branch: refs/heads/master Commit: 8d5c78e3d4a4fd47c645aa4bca7bc316d5fa2f8d Parents: affc162 Author: Pranav Saxena <[email protected]> Authored: Sun Nov 11 09:37:13 2012 +0530 Committer: Vijay Venkatachalam <[email protected]> Committed: Fri Nov 16 11:06:44 2012 +0530 ---------------------------------------------------------------------- ui/scripts/autoscaler.js | 50 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8d5c78e3/ui/scripts/autoscaler.js ---------------------------------------------------------------------- diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js index 5ccfacb..a56fd94 100644 --- a/ui/scripts/autoscaler.js +++ b/ui/scripts/autoscaler.js @@ -186,8 +186,8 @@ destroyVMgracePeriod: autoscaleVmProfile.destroyvmgraceperiod, securityGroups: securityGroups, diskOfferingId: diskOfferingId, - snmpCommunity: autoscaleVmProfile.snmpcommunity, - snmpPort: autoscaleVmProfile.snmpport, + snmpCommunity: autoscaleVmProfile.counterparam.snmpcommunity, + snmpPort: autoscaleVmProfile.counterparam.snmpport, username: autoscaleVmProfile.autoscaleuserid, context: { autoscaleVmGroup: autoscaleVmGroup, @@ -1075,7 +1075,27 @@ destroyvmgraceperiod: args.data.destroyVMgracePeriod, snmpcommunity: args.data.snmpCommunity, snmpport: args.data.snmpPort - }; + }; + + var allParamNames=$.map(data,function(value,key){ + return key; + }); + + var notParams =['zoneid','serviceofferingid','templateid','destroyvmgraceperiod']; + var index=0; + $(allParamNames).each(function() { + var param='counterparam[' + index + ']'; + var name = this.toString(); + var value = data[name]; + if(!value || $.inArray(name,notParams) >-1 ) return true; + data[param+ '.name']=name; + data[param+ '.value']=value; + index++; + delete data[name]; + + return true; + }); + if(args.data.username != null && args.data.username.length > 0) { $.extend(data, { @@ -1138,7 +1158,29 @@ destroyvmgraceperiod: args.data.destroyVMgracePeriod, snmpcommunity: args.data.snmpCommunity, snmpport: args.data.snmpPort - }; + }; + + var allParamNames=$.map(data,function(value,key){ + return key; + }); + + var notParams =['id','templateid','destroyvmgraceperiod']; + var index=0; + $(allParamNames).each(function() { + var param='counterparam[' + index + ']'; + var name = this.toString(); + var value = data[name]; + if(!value || $.inArray(name,notParams) >-1 ) return true; + data[param+ '.name']=name; + data[param+ '.value']=value; + index++; + delete data[name]; + + return true; + }); + + + if(args.data.username != null && args.data.username.length > 0) { $.extend(data, {
