Netflix · coryb · Oct 8, 2013 · Sep 13, 2013 · Sep 13, 2013 · Sep 13, 2013
diff --git a/build.gradle b/build.gradle
@@ -42,6 +42,9 @@ dependencies {
     compile 'com.google.guava:guava:11.+'
     compile 'org.apache.httpcomponents:httpclient:4.2.1'
     compile 'org.apache.httpcomponents:httpcore:4.2.1'
+    compile 'org.jclouds:jclouds-all:1.6.0'
+    compile 'org.jclouds.driver:jclouds-jsch:1.6.0'
+    compile 'org.jclouds.driver:jclouds-slf4j:1.6.0'
 
     testCompile 'org.testng:testng:6.3.1'
     testCompile 'org.mockito:mockito-core:1.8.5'

diff --git a/src/main/java/com/netflix/simianarmy/CloudClient.java b/src/main/java/com/netflix/simianarmy/CloudClient.java
@@ -17,8 +17,12 @@
  */
 package com.netflix.simianarmy;
 
+import java.util.List;
 import java.util.Map;
 
+import org.jclouds.compute.ComputeService;
+import org.jclouds.domain.LoginCredentials;
+import org.jclouds.ssh.SshClient;
 
 /**
  * The CloudClient interface. This abstractions provides the interface that the monkeys need to interact with
@@ -88,4 +92,108 @@ public interface CloudClient {
      */
     void createTagsForResources(Map<String, String> keyValueMap, String... resourceIds);
 
+    /**
+     * Lists all EBS volumes attached to the specified instance.
+     *
+     * @param instanceId
+     *            the instance id
+     * @param includeRoot
+     *            if the root volume is on EBS, should we include it?
+     *
+     * @throws NotFoundException
+     *             if the instance no longer exists or was already terminated after the crawler discovered it then you
+     *             should get a NotFoundException
+     */
+    List<String> listAttachedVolumes(String instanceId, boolean includeRoot);
+
+    /**
+     * Detaches an EBS volumes from the specified instance.
+     *
+     * @param instanceId
+     *            the instance id
+     * @param volumeId
+     *            the volume id
+     * @param force
+     *            if we should force-detach the volume.  Probably best not to use on high-value volumes.
+     *
+     * @throws NotFoundException
+     *             if the instance no longer exists or was already terminated after the crawler discovered it then you
+     *             should get a NotFoundException
+     */
+    void detachVolume(String instanceId, String volumeId, boolean force);
+
+    /**
+     * Returns the jClouds compute service.
+     */
+    ComputeService getJcloudsComputeService();
+
+    /**
+     * Returns the jClouds node id for an instance id on this CloudClient.
+     */
+    String getJcloudsId(String instanceId);
+
+    /**
+     * Opens an SSH connection to an instance.
+     *
+     * @param instanceId
+     *            instance id to connect to
+     * @param credentials
+     *            SSH credentials to use
+     * @return {@link SshClient}, in connected state
+     */
+    SshClient connectSsh(String instanceId, LoginCredentials credentials);
+
+    /**
+     * Finds a security group with the given name, that can be applied to the given instance.
+     *
+     * For example, if it is a VPC instance, it makes sure that it is in the same VPC group.
+     *
+     * @param instanceId
+     *            the instance that the group must be applied to
+     * @param groupName
+     *            the name of the group to find
+     *
+     * @return The group id, or null if not found
+     */
+    String findSecurityGroup(String instanceId, String groupName);
+
+    /**
+     * Creates an (empty) security group, that can be applied to the given instance.
+     *
+     * @param instanceId
+     *            instance that group should be applicable to
+     * @param groupName
+     *            name for new group
+     * @param description
+     *            description for new group
+     *
+     * @return the id of the security group
+     */
+    String createSecurityGroup(String instanceId, String groupName, String description);
+
+    /**
+     * Checks if we can change the security groups of an instance.
+     *
+     * @param instanceId
+     *            instance to check
+     *
+     * @return true iff we can change security groups.
+     */
+    boolean canChangeInstanceSecurityGroups(String instanceId);
+
+    /**
+     * Sets the security groups for an instance.
+     *
+     * Note this is only valid for VPC instances.
+     *
+     * @param instanceId
+     *            the instance id
+     * @param groupIds
+     *            ids of desired new groups
+     *
+     * @throws NotFoundException
+     *             if the instance no longer exists or was already terminated after the crawler discovered it then you
+     *             should get a NotFoundException
+     */
+    void setInstanceSecurityGroups(String instanceId, List<String> groupIds);
 }
diff --git a/src/main/java/com/netflix/simianarmy/aws/SimpleDBRecorder.java b/src/main/java/com/netflix/simianarmy/aws/SimpleDBRecorder.java
@@ -257,6 +257,11 @@ public List<Event> findEvents(Enum monkeyType, Enum eventType, Map<String, Strin
      */
     public void init() {
         try {
+            if (this.region == null || this.region.equals("region-null")) {
+                // This is a mock with an invalid region; avoid a slow timeout
+                LOGGER.debug("Region=null; skipping SimpleDB domain creation");
+                return;
+            }
             ListDomainsResult listDomains = sdbClient().listDomains();
             for (String d : listDomains.getDomainNames()) {
                 if (d.equals(domain)) {

diff --git a/src/main/java/com/netflix/simianarmy/basic/chaos/BasicChaosEmailNotifier.java b/src/main/java/com/netflix/simianarmy/basic/chaos/BasicChaosEmailNotifier.java
@@ -28,6 +28,7 @@
 import com.netflix.simianarmy.MonkeyConfiguration;
 import com.netflix.simianarmy.chaos.ChaosCrawler.InstanceGroup;
 import com.netflix.simianarmy.chaos.ChaosEmailNotifier;
+import com.netflix.simianarmy.chaos.ChaosType;
 
 /** The basic implementation of the email notifier for Chaos monkey.
  *
@@ -62,29 +63,31 @@ public BasicChaosEmailNotifier(MonkeyConfiguration cfg, AmazonSimpleEmailService
      * email address.
      * @param group the instance group
      * @param instanceId the instance id
+     * @param chaosType the chosen chaos strategy
      */
     @Override
-    public void sendTerminationGlobalNotification(InstanceGroup group, String instanceId) {
+    public void sendTerminationGlobalNotification(InstanceGroup group, String instanceId, ChaosType chaosType) {
         String to = cfg.getStr("simianarmy.chaos.notification.global.receiverEmail");
         if (StringUtils.isBlank(to)) {
             LOGGER.warn("Global email address was not set, but global email notification was enabled!");
             return;
         }
         LOGGER.info("sending termination notification to global email address {}", to);
-        buildAndSendEmail(to, group, instanceId);
+        buildAndSendEmail(to, group, instanceId, chaosType);
     }
 
     /**
      * Sends an email notification for a termination of instance to the group
      * owner's email address.
      * @param group the instance group
      * @param instanceId the instance id
+     * @param chaosType the chosen chaos strategy
      */
     @Override
-    public void sendTerminationNotification(InstanceGroup group, String instanceId) {
+    public void sendTerminationNotification(InstanceGroup group, String instanceId, ChaosType chaosType) {
         String to = getOwnerEmail(group);
         LOGGER.info("sending termination notification to group owner email address {}", to);
-        buildAndSendEmail(to, group, instanceId);
+        buildAndSendEmail(to, group, instanceId, chaosType);
     }
 
     /**
@@ -113,9 +116,10 @@ protected String getOwnerEmail(InstanceGroup group) {
      *          the instance id
      * @param to
      *          the email address to be sent to
+     * @param chaosType the chosen chaos strategy
      */
-    public void buildAndSendEmail(String to, InstanceGroup group, String instanceId) {
-        String body = buildEmailBody(group, instanceId);
+    public void buildAndSendEmail(String to, InstanceGroup group, String instanceId, ChaosType chaosType) {
+        String body = buildEmailBody(group, instanceId, chaosType);
 
         String subject;
         boolean emailSubjectIsBody = cfg.getBoolOrElse(
@@ -143,13 +147,20 @@ public String buildEmailSubject(String to) {
      *          the instance group
      * @param instanceId
      *          the instance id
+     * @param chaosType the chosen chaos strategy
      * @return the created string
      */
-    public String buildEmailBody(InstanceGroup group, String instanceId) {
+    public String buildEmailBody(InstanceGroup group, String instanceId, ChaosType chaosType) {
         String emailBodyPrefix = cfg.getStrOrElse("simianarmy.chaos.notification.body.prefix", "");
         String emailBodySuffix = cfg.getStrOrElse("simianarmy.chaos.notification.body.suffix", "");
-        String body = String.format("%sInstance %s of %s %s is being terminated by Chaos monkey.%s",
-                    emailBodyPrefix, instanceId, group.type(), group.name(), emailBodySuffix);
+        String body = emailBodyPrefix;
+        body += String.format("Instance %s of %s %s is being terminated by Chaos monkey.",
+                    instanceId, group.type(), group.name());
+        if (chaosType != null) {
+            body += "\n";
+            body += String.format("Chaos type: %s.", chaosType.getKey());
+        }
+        body += emailBodySuffix;
         return body;
     }