diff --git a/core/src/com/cloud/network/resource/NetscalerResource.java b/core/src/com/cloud/network/resource/NetscalerResource.java index dac08fca4d9..f8ae5247349 100644 --- a/core/src/com/cloud/network/resource/NetscalerResource.java +++ b/core/src/com/cloud/network/resource/NetscalerResource.java @@ -42,6 +42,8 @@ import com.citrix.netscaler.nitro.resource.config.network.vlan_nsip_binding; import com.citrix.netscaler.nitro.resource.config.ns.nsconfig; import com.citrix.netscaler.nitro.resource.config.ns.nshardware; import com.citrix.netscaler.nitro.resource.config.ns.nsip; +import com.citrix.netscaler.nitro.resource.config.ns.nstimer; +import com.citrix.netscaler.nitro.resource.config.ns.nstimer_autoscalepolicy_binding; import com.citrix.netscaler.nitro.resource.config.autoscale.*; import com.citrix.netscaler.nitro.resource.stat.lb.lbvserver_stats; import com.citrix.netscaler.nitro.service.nitro_service; @@ -1640,7 +1642,7 @@ public class NetscalerResource implements ServerResource { } // Add Timer - com.citrix.netscaler.nitro.resource.config.timer.timertrigger timer = new com.citrix.netscaler.nitro.resource.config.timer.timertrigger(); + nstimer timer = new nstimer(); try { timer.set_name(timerName); timer.set_interval(interval); @@ -1937,7 +1939,7 @@ public class NetscalerResource implements ServerResource { } // Delete Timer - com.citrix.netscaler.nitro.resource.config.timer.timertrigger timer = new com.citrix.netscaler.nitro.resource.config.timer.timertrigger(); + nstimer timer = new nstimer(); try { timer.set_name(timerName); timer.delete(_netscalerService, timer); @@ -2009,7 +2011,7 @@ public class NetscalerResource implements ServerResource { // Adding a autoscale policy // add timer policy lb_policy_scaleUp_cpu_mem -rule - (SYS.CUR_VSERVER.METRIC_TABLE(cpu).AVG_VAL.GT(80)- // -action lb_scaleUpAction - timerpolicy timerPolicy = new timerpolicy(); + autoscalepolicy timerPolicy = new autoscalepolicy(); try { timerPolicy.set_name(policyName); timerPolicy.set_action(action); @@ -2025,7 +2027,7 @@ public class NetscalerResource implements ServerResource { // bind timer trigger lb_astimer -policyName lb_policy_scaleUp -vserver lb -priority 1 -samplesize 5 // TODO: later bind to lbvserver. bind timer trigger lb_astimer -policyName lb_policy_scaleUp -vserver lb -priority 1 -samplesize 5 // -thresholdsize 5 - timertrigger_timerpolicy_binding timer_policy_binding = new timertrigger_timerpolicy_binding(); + nstimer_autoscalepolicy_binding timer_policy_binding = new nstimer_autoscalepolicy_binding(); int sampleSize = duration/interval; try { timer_policy_binding.set_name(timerName); @@ -2045,7 +2047,7 @@ public class NetscalerResource implements ServerResource { private void removeAutoScalePolicy(String timerName, String policyName, boolean isCleanUp) throws Exception { // unbind timer policy // unbbind timer trigger lb_astimer -policyName lb_policy_scaleUp - com.citrix.netscaler.nitro.resource.config.timer.timertrigger_timerpolicy_binding timer_policy_binding = new com.citrix.netscaler.nitro.resource.config.timer.timertrigger_timerpolicy_binding(); + nstimer_autoscalepolicy_binding timer_policy_binding = new nstimer_autoscalepolicy_binding(); try { timer_policy_binding.set_name(timerName); timer_policy_binding.set_policyname(policyName); @@ -2058,7 +2060,7 @@ public class NetscalerResource implements ServerResource { // Removing Timer policy // rm timer policy lb_policy_scaleUp_cpu_mem - com.citrix.netscaler.nitro.resource.config.timer.timerpolicy timerPolicy = new com.citrix.netscaler.nitro.resource.config.timer.timerpolicy(); + autoscalepolicy timerPolicy = new autoscalepolicy(); try { timerPolicy.set_name(policyName); timerPolicy.delete(_netscalerService, timerPolicy); @@ -2270,8 +2272,4 @@ public class NetscalerResource implements ServerResource { public void disconnected() { return; } - - - - } diff --git a/deps/cloud-netscaler.jar b/deps/cloud-netscaler.jar index 3097b787885..475ff638440 100755 Binary files a/deps/cloud-netscaler.jar and b/deps/cloud-netscaler.jar differ