diff --git a/compute/src/main/clojure/org/jclouds/compute2.clj b/compute/src/main/clojure/org/jclouds/compute2.clj index cf01e43449..2f643da5af 100644 --- a/compute/src/main/clojure/org/jclouds/compute2.clj +++ b/compute/src/main/clojure/org/jclouds/compute2.clj @@ -128,7 +128,7 @@ Here's an example of creating and running a small linux node in the group webser (defn nodes-in-group "list details of all the nodes in the given group." - ([#^String group #^ComputeService compute] + ([#^ComputeService compute #^String group] (filter #(= (.getTag %) group) (nodes-with-details compute)))) (defn images @@ -159,7 +159,7 @@ Here's an example of creating and running a small linux node in the group webser ([group count compute] (create-nodes group count (default-template compute) compute)) - ([group count template #^ComputeService compute] + ([#^ComputeService compute group count template] (seq (.createNodesInGroup compute group count template)))) @@ -171,19 +171,19 @@ Here's an example of creating and running a small linux node in the group webser ;; Note that this will actually add another node to the set called ;; \"webserver\"" - ([group compute] - (create-node group compute (default-template compute))) - ([group compute template] - (first (create-nodes group 1 template compute)))) + ([compute group] + (create-node compute group (default-template compute))) + ([compute group template] + (first (create-nodes compute group 1 template)))) (defn #^NodeMetadata node-details "Retrieve the node metadata, given its id." - ([id #^ComputeService compute] + ([#^ComputeService compute id] (.getNodeMetadata compute id))) (defn suspend-nodes-in-group "Reboot all the nodes in the given group." - ([#^String group #^ComputeService compute] + ([#^ComputeService compute #^String group] (.suspendNodesMatching compute (NodePredicates/inGroup group)))) (defn suspend-node @@ -193,7 +193,7 @@ Here's an example of creating and running a small linux node in the group webser (defn resume-nodes-in-group "Suspend all the nodes in the given group." - ([#^String group #^ComputeService compute] + ([#^ComputeService compute #^String group] (.resumeNodesMatching compute (NodePredicates/inGroup group)))) (defn resume-node @@ -203,7 +203,7 @@ Here's an example of creating and running a small linux node in the group webser (defn reboot-nodes-in-group "Reboot all the nodes in the given group." - ([#^String group #^ComputeService compute] + ([#^ComputeService compute #^String group] (.rebootNodesMatching compute (NodePredicates/inGroup group)))) (defn reboot-node @@ -213,7 +213,7 @@ Here's an example of creating and running a small linux node in the group webser (defn destroy-nodes-in-group "Destroy all the nodes in the given group." - ([#^String group #^ComputeService compute] + ([#^ComputeService compute #^String group] (.destroyNodesMatching compute (NodePredicates/inGroup group)))) (defn destroy-node diff --git a/compute/src/test/clojure/org/jclouds/compute2_test.clj b/compute/src/test/clojure/org/jclouds/compute2_test.clj index ad1ec883c8..731cc61b1d 100644 --- a/compute/src/test/clojure/org/jclouds/compute2_test.clj +++ b/compute/src/test/clojure/org/jclouds/compute2_test.clj @@ -56,20 +56,20 @@ list, Alan Dipert and MeikelBrandmeyer." (deftest nodes-test (is (empty? (nodes *compute*))) - (is (create-node "fred" *compute* (build-template *compute* {} ))) + (is (create-node *compute* "fred" (build-template *compute* {} ))) (is (= 1 (count (nodes *compute*)))) - (is (= 1 (count (nodes-in-group "fred" *compute*)))) - (suspend-nodes-in-group "fred" *compute*) - (is (suspended? (first (nodes-in-group "fred" *compute*)))) - (resume-nodes-in-group "fred" *compute*) - (is (running? (first (nodes-in-group "fred" *compute*)))) - (reboot-nodes-in-group "fred" *compute*) - (is (running? (first (nodes-in-group "fred" *compute*)))) - (is (create-nodes "fred" 2 (build-template *compute* {} ) *compute*)) - (is (= 3 (count (nodes-in-group "fred" *compute*)))) + (is (= 1 (count (nodes-in-group *compute* "fred")))) + (suspend-nodes-in-group *compute* "fred") + (is (suspended? (first (nodes-in-group *compute* "fred")))) + (resume-nodes-in-group *compute* "fred") + (is (running? (first (nodes-in-group *compute* "fred")))) + (reboot-nodes-in-group *compute* "fred") + (is (running? (first (nodes-in-group *compute* "fred")))) + (is (create-nodes *compute* "fred" 2 (build-template *compute* {} ))) + (is (= 3 (count (nodes-in-group *compute* "fred")))) (is (= "fred" (group (first (nodes *compute*))))) - (destroy-nodes-in-group "fred" *compute*) - (is (terminated? (first (nodes-in-group "fred" *compute*))))) + (destroy-nodes-in-group *compute* "fred") + (is (terminated? (first (nodes-in-group *compute* "fred"))))) (deftest build-template-test (let [service (compute-service "stub" "user" "password")]