Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Putting the ComputeService argument as the first argument, where it should be

This commit is contained in:
Mattias Holmqvist 2011-05-01 23:32:41 +02:00
parent fbe02ae4d8
commit b129d17de3
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
compute/src/main/clojure/org/jclouds/compute2.clj
View File

@ -128,7 +128,7 @@ Here's an example of creating and running a small linux node in the group webser
(defn nodes-in-group (defn nodes-in-group
"list details of all the nodes in the given 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)))) (filter #(= (.getTag %) group) (nodes-with-details compute))))
(defn images (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] ([group count compute]
(create-nodes (create-nodes
group count (default-template compute) compute)) group count (default-template compute) compute))
([group count template #^ComputeService compute] ([#^ComputeService compute group count template]
(seq (seq
(.createNodesInGroup compute group count template)))) (.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 ;; Note that this will actually add another node to the set called
;; \"webserver\"" ;; \"webserver\""
([group compute] ([compute group]
(create-node group compute (default-template compute))) (create-node compute group (default-template compute)))
([group compute template] ([compute group template]
(first (create-nodes group 1 template compute)))) (first (create-nodes compute group 1 template))))
(defn #^NodeMetadata node-details (defn #^NodeMetadata node-details
"Retrieve the node metadata, given its id." "Retrieve the node metadata, given its id."
([id #^ComputeService compute] ([#^ComputeService compute id]
(.getNodeMetadata compute id))) (.getNodeMetadata compute id)))
(defn suspend-nodes-in-group (defn suspend-nodes-in-group
"Reboot all the nodes in the given group." "Reboot all the nodes in the given group."
([#^String group #^ComputeService compute] ([#^ComputeService compute #^String group]
(.suspendNodesMatching compute (NodePredicates/inGroup group)))) (.suspendNodesMatching compute (NodePredicates/inGroup group))))
(defn suspend-node (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 (defn resume-nodes-in-group
"Suspend all the nodes in the given group." "Suspend all the nodes in the given group."
([#^String group #^ComputeService compute] ([#^ComputeService compute #^String group]
(.resumeNodesMatching compute (NodePredicates/inGroup group)))) (.resumeNodesMatching compute (NodePredicates/inGroup group))))
(defn resume-node (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 (defn reboot-nodes-in-group
"Reboot all the nodes in the given group." "Reboot all the nodes in the given group."
([#^String group #^ComputeService compute] ([#^ComputeService compute #^String group]
(.rebootNodesMatching compute (NodePredicates/inGroup group)))) (.rebootNodesMatching compute (NodePredicates/inGroup group))))
(defn reboot-node (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 (defn destroy-nodes-in-group
"Destroy all the nodes in the given group." "Destroy all the nodes in the given group."
([#^String group #^ComputeService compute] ([#^ComputeService compute #^String group]
(.destroyNodesMatching compute (NodePredicates/inGroup group)))) (.destroyNodesMatching compute (NodePredicates/inGroup group))))
(defn destroy-node (defn destroy-node

24
compute/src/test/clojure/org/jclouds/compute2_test.clj
View File

@ -56,20 +56,20 @@ list, Alan Dipert and MeikelBrandmeyer."
(deftest nodes-test (deftest nodes-test
(is (empty? (nodes *compute*))) (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 *compute*))))
(is (= 1 (count (nodes-in-group "fred" *compute*)))) (is (= 1 (count (nodes-in-group *compute* "fred"))))
(suspend-nodes-in-group "fred" *compute*) (suspend-nodes-in-group *compute* "fred")
(is (suspended? (first (nodes-in-group "fred" *compute*)))) (is (suspended? (first (nodes-in-group *compute* "fred"))))
(resume-nodes-in-group "fred" *compute*) (resume-nodes-in-group *compute* "fred")
(is (running? (first (nodes-in-group "fred" *compute*)))) (is (running? (first (nodes-in-group *compute* "fred"))))
(reboot-nodes-in-group "fred" *compute*) (reboot-nodes-in-group *compute* "fred")
(is (running? (first (nodes-in-group "fred" *compute*)))) (is (running? (first (nodes-in-group *compute* "fred"))))
(is (create-nodes "fred" 2 (build-template *compute* {} ) *compute*)) (is (create-nodes *compute* "fred" 2 (build-template *compute* {} )))
(is (= 3 (count (nodes-in-group "fred" *compute*)))) (is (= 3 (count (nodes-in-group *compute* "fred"))))
(is (= "fred" (group (first (nodes *compute*))))) (is (= "fred" (group (first (nodes *compute*)))))
(destroy-nodes-in-group "fred" *compute*) (destroy-nodes-in-group *compute* "fred")
(is (terminated? (first (nodes-in-group "fred" *compute*))))) (is (terminated? (first (nodes-in-group *compute* "fred")))))
(deftest build-template-test (deftest build-template-test
(let [service (compute-service "stub" "user" "password")] (let [service (compute-service "stub" "user" "password")]