add rest of nimbus methods to localcluster

Nathan Marz · Nathan Marz · commit 635b483f48e2 · 2012-03-22T21:53:04.000-07:00
diff --git a/src/clj/backtype/storm/LocalCluster.clj b/src/clj/backtype/storm/LocalCluster.clj
@@ -18,25 +18,31 @@
                       topology))
 
 (defn -shutdown [this]
-  (kill-local-storm-cluster (. this state))
-  )
+  (kill-local-storm-cluster (. this state)))
 
 (defn -killTopology [this name]
-  (.killTopology (:nimbus (. this state)) name)
-  )
+  (.killTopology (:nimbus (. this state)) name))
 
 (defn -getTopologyConf [this id]
-  (.getTopologyConf (:nimbus (. this state)) id)
-  )
+  (.getTopologyConf (:nimbus (. this state)) id))
 
 (defn -getTopology [this id]
-  (.getTopology (:nimbus (. this state)) id)
-  )
+  (.getTopology (:nimbus (. this state)) id))
 
 (defn -getClusterInfo [this]
-  (.getClusterInfo (:nimbus (. this state)))
-  )
+  (.getClusterInfo (:nimbus (. this state))))
 
 (defn -getTopologyInfo [this id]
-  (.getTopologyInfo (:nimbus (. this state)) id)
-  )
+  (.getTopologyInfo (:nimbus (. this state)) id))
+
+(defn -killTopologyWithOpts [this name opts]
+  (.killTopologyWithOpts (:nimbus (. this state)) name opts))
+
+(defn -activate [this name]
+  (.activate (:nimbus (. this state)) name))
+
+(defn -deactivate [this name]
+  (.deactivate (:nimbus (. this state)) name))
+
+(defn -rebalance [this name opts]
+  (.rebalance (:nimbus (. this state)) name opts))
diff --git a/src/jvm/backtype/storm/ILocalCluster.java b/src/jvm/backtype/storm/ILocalCluster.java
@@ -3,18 +3,22 @@
 import backtype.storm.generated.AlreadyAliveException;
 import backtype.storm.generated.ClusterSummary;
 import backtype.storm.generated.InvalidTopologyException;
+import backtype.storm.generated.KillOptions;
 import backtype.storm.generated.NotAliveException;
+import backtype.storm.generated.RebalanceOptions;
 import backtype.storm.generated.StormTopology;
 import backtype.storm.generated.TopologyInfo;
 
 import java.util.Map;
 
 
 public interface ILocalCluster {
-    void submitTopology(String topologyName, Map conf, StormTopology topology)
-            throws AlreadyAliveException, InvalidTopologyException;
-    void killTopology(String topologyName)
-            throws NotAliveException;
+    void submitTopology(String topologyName, Map conf, StormTopology topology) throws AlreadyAliveException, InvalidTopologyException;
+    void killTopology(String topologyName) throws NotAliveException;
+    void killTopologyWithOpts(String name, KillOptions options) throws NotAliveException;
+    void activate(String topologyName) throws NotAliveException;
+    void deactivate(String topologyName) throws NotAliveException;
+    void rebalance(String name, RebalanceOptions options) throws NotAliveException;
     void shutdown();
     String getTopologyConf(String id);
     StormTopology getTopology(String id);
