You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/12/07 15:55:32 UTC
jclouds-labs git commit: JCLOUDS-1183 - oneandone-monitoringcenter-api
Repository: jclouds-labs
Updated Branches:
refs/heads/master d39c7e6b5 -> 8bd83980b
JCLOUDS-1183 - oneandone-monitoringcenter-api
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/8bd83980
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/8bd83980
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/8bd83980
Branch: refs/heads/master
Commit: 8bd83980bde58892aae7a4193a3b3e0c9edc2f73
Parents: d39c7e6
Author: alibazlamit <al...@ali-G751JT>
Authored: Fri Dec 2 16:30:13 2016 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Dec 7 16:52:05 2016 +0100
----------------------------------------------------------------------
.../jclouds/oneandone/rest/OneAndOneApi.java | 4 +-
.../jclouds/oneandone/rest/domain/Types.java | 2 +-
.../features/MonitoringCenterApiLiveTest.java | 59 ++++++++++++++++++--
.../rest/internal/BaseOneAndOneLiveTest.java | 2 +-
4 files changed, 59 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/8bd83980/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/OneAndOneApi.java
----------------------------------------------------------------------
diff --git a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/OneAndOneApi.java b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/OneAndOneApi.java
index 50610de..77352d4 100644
--- a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/OneAndOneApi.java
+++ b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/OneAndOneApi.java
@@ -52,8 +52,8 @@ public interface OneAndOneApi extends Closeable {
@Delegate
PrivateNetworkApi privateNetworkApi();
- @Delegate
- VpnApi vpnApi();
+ @Delegate
+ VpnApi vpnApi();
@Delegate
MonitoringCenterApi monitoringCenterApi();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/8bd83980/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Types.java
----------------------------------------------------------------------
diff --git a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Types.java b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Types.java
index 8f70ee4..2228d59 100644
--- a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Types.java
+++ b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Types.java
@@ -208,7 +208,7 @@ public class Types {
public static PeriodType fromValue(String v) {
return Enums.getIfPresent(PeriodType.class, v).or(UNRECOGNIZED);
-}
+ }
}
public enum CustomPeriodType {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/8bd83980/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiLiveTest.java
----------------------------------------------------------------------
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiLiveTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiLiveTest.java
index 57ab678..b25922d 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiLiveTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/MonitoringCenterApiLiveTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.jclouds.oneandone.rest.features;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import java.util.Random;
import org.apache.jclouds.oneandone.rest.domain.MonitoringCenter;
+import org.apache.jclouds.oneandone.rest.domain.MonitoringPolicy;
import org.apache.jclouds.oneandone.rest.domain.Server;
import org.apache.jclouds.oneandone.rest.domain.Types;
import org.apache.jclouds.oneandone.rest.domain.options.GenericDateQueryOptions;
@@ -35,6 +38,7 @@ import org.testng.annotations.Test;
public class MonitoringCenterApiLiveTest extends BaseOneAndOneLiveTest {
private Server currentServer;
+ private MonitoringPolicy currentPolicy;
private MonitoringCenterApi monitoringCenterApi() {
@@ -43,8 +47,56 @@ public class MonitoringCenterApiLiveTest extends BaseOneAndOneLiveTest {
@BeforeClass
public void setupTest() throws InterruptedException {
- currentServer = createServer("Monitoring Center jclouds server");
+ Random rand = new Random();
+ int randomName = rand.nextInt(100);
+
+ currentServer = createServer("Monitoring Center jclouds server" + randomName);
assertNodeAvailable(currentServer);
+
+ List<MonitoringPolicy.Port.AddPort> ports = new ArrayList<MonitoringPolicy.Port.AddPort>();
+ MonitoringPolicy.Port.AddPort port = MonitoringPolicy.Port.AddPort.create(80, Types.AlertIfType.RESPONDING, true, Types.ProtocolType.TCP);
+ ports.add(port);
+
+ List<org.apache.jclouds.oneandone.rest.domain.MonitoringPolicy.Process.AddProcess> processes = new ArrayList<org.apache.jclouds.oneandone.rest.domain.MonitoringPolicy.Process.AddProcess>();
+ org.apache.jclouds.oneandone.rest.domain.MonitoringPolicy.Process.AddProcess process = org.apache.jclouds.oneandone.rest.domain.MonitoringPolicy.Process.AddProcess.create("", Types.AlertIfType.RESPONDING, true);
+ processes.add(process);
+
+ MonitoringPolicy.Threshold.Cpu.Warning warning = MonitoringPolicy.Threshold.Cpu.Warning.create(90, true);
+ MonitoringPolicy.Threshold.Cpu.Critical critical = MonitoringPolicy.Threshold.Cpu.Critical.create(95, true);
+ MonitoringPolicy.Threshold.Cpu cpu = MonitoringPolicy.Threshold.Cpu.create(warning, critical);
+
+ MonitoringPolicy.Threshold.Ram.Warning ramWarning = MonitoringPolicy.Threshold.Ram.Warning.create(90, true);
+ MonitoringPolicy.Threshold.Ram.Critical ramCritical = MonitoringPolicy.Threshold.Ram.Critical.create(95, true);
+ MonitoringPolicy.Threshold.Ram ram = MonitoringPolicy.Threshold.Ram.create(ramWarning, ramCritical);
+
+ MonitoringPolicy.Threshold.Disk.Warning diskWarning = MonitoringPolicy.Threshold.Disk.Warning.create(90, true);
+ MonitoringPolicy.Threshold.Disk.Critical diskCritical = MonitoringPolicy.Threshold.Disk.Critical.create(95, true);
+ MonitoringPolicy.Threshold.Disk disk = MonitoringPolicy.Threshold.Disk.create(diskWarning, diskCritical);
+
+ MonitoringPolicy.Threshold.InternalPing.Warning pingWarning = MonitoringPolicy.Threshold.InternalPing.Warning.create(50, true);
+ MonitoringPolicy.Threshold.InternalPing.Critical pingCritical = MonitoringPolicy.Threshold.InternalPing.Critical.create(100, true);
+ MonitoringPolicy.Threshold.InternalPing ping = MonitoringPolicy.Threshold.InternalPing.create(pingWarning, pingCritical);
+
+ MonitoringPolicy.Threshold.Transfer.Warning tranWarning = MonitoringPolicy.Threshold.Transfer.Warning.create(1000, true);
+ MonitoringPolicy.Threshold.Transfer.Critical tranCritical = MonitoringPolicy.Threshold.Transfer.Critical.create(2000, true);
+ MonitoringPolicy.Threshold.Transfer transfer = MonitoringPolicy.Threshold.Transfer.create(tranWarning, tranCritical);
+
+ MonitoringPolicy.Threshold threshold = MonitoringPolicy.Threshold.create(cpu, ram, disk, transfer, ping);
+ MonitoringPolicy.CreatePolicy payload = MonitoringPolicy.CreatePolicy.builder()
+ .name("jclouds policy" + randomName)
+ .agent(true)
+ .email("j@clouds.com")
+ .ports(ports)
+ .processes(processes)
+ .description("dsec")
+ .thresholds(threshold)
+ .build();
+ currentPolicy = api.monitoringPolicyApi().create(payload);
+
+ List<String> servers = new ArrayList<String>();
+ servers.add(currentServer.id());
+ MonitoringPolicy response = api.monitoringPolicyApi().attachServer(currentPolicy.id(), MonitoringPolicy.Server.CreateServer.create(servers));
+ assertNotNull(response);
}
@Test
@@ -84,10 +136,9 @@ public class MonitoringCenterApiLiveTest extends BaseOneAndOneLiveTest {
MonitoringCenter result = monitoringCenterApi().get(currentServer.id(), options);
assertNotNull(result);
}
-
- @AfterClass(alwaysRun = true)
+
+ @AfterClass(alwaysRun = true)
public void teardownTest() throws InterruptedException {
- assertNodeAvailable(currentServer);
deleteServer(currentServer.id());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/8bd83980/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneLiveTest.java
----------------------------------------------------------------------
diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneLiveTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneLiveTest.java
index 7ef372e..ba1fc4e 100644
--- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneLiveTest.java
+++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/internal/BaseOneAndOneLiveTest.java
@@ -127,7 +127,7 @@ public class BaseOneAndOneLiveTest extends BaseApiLiveTest<OneAndOneApi> {
protected void assertPrivateNetworkAvailable(ServerPrivateNetworkRef ref) {
assertTrue(waitUntilPrivateNetworkReady.apply(ref), String.format("ServerPrivateNetworkRef %s is not Ready", ref));
}
-
+
protected void assertVPNAvailable(Vpn vpn) {
assertTrue(waitUntilVPNReady.apply(vpn), String.format("VPN %s is not Ready", vpn));
}