From aff363a42d670f1b3100a98aab6f17b49f644179 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 19 May 2009 22:50:12 +0100
Subject: [PATCH] Drop RAPI v1 compatiblity

Since we only support Ganeti 2.0, we drop the 1.2 compatibility.
---
 Ganeti/HTools/Rapi.hs |   42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/Ganeti/HTools/Rapi.hs b/Ganeti/HTools/Rapi.hs
index bfba589..5373293 100644
--- a/Ganeti/HTools/Rapi.hs
+++ b/Ganeti/HTools/Rapi.hs
@@ -33,37 +33,23 @@ getUrl url = do
             _ -> Left $ printf "Curl error for '%s', error %s"
                  url (show code))
 
-tryRapi :: String -> String -> IO (Either String String)
-tryRapi url1 url2 =
-    do
-      body1 <- getUrl url1
-      (case body1 of
-         Left _ -> getUrl url2
-         Right _ -> return body1)
-
 getInstances :: String -> IO (Either String String)
-getInstances master =
-    let
-        url2 = printf "https://%s:5080/2/instances?bulk=1" master
-        url1 = printf "http://%s:5080/instances?bulk=1" master
-    in do
-      body <- tryRapi url1 url2
-      let inst = body `combineEithers`
-                 loadJSArray `combineEithers`
-                 (parseEitherList parseInstance)
-      return inst
+getInstances master = do
+  let url2 = printf "https://%s:5080/2/instances?bulk=1" master
+  body <- getUrl url2
+  let inst = body `combineEithers`
+             loadJSArray `combineEithers`
+             (parseEitherList parseInstance)
+  return inst
 
 getNodes :: String -> IO (Either String String)
-getNodes master =
-    let
-        url2 = printf "https://%s:5080/2/nodes?bulk=1" master
-        url1 = printf "http://%s:5080/nodes?bulk=1" master
-    in do
-      body <- tryRapi url1 url2
-      let inst = body `combineEithers`
-                 loadJSArray `combineEithers`
-                 (parseEitherList parseNode)
-      return inst
+getNodes master = do
+  let url2 = printf "https://%s:5080/2/nodes?bulk=1" master
+  body <- getUrl url2
+  let inst = body `combineEithers`
+             loadJSArray `combineEithers`
+             (parseEitherList parseNode)
+  return inst
 
 parseInstance :: JSObject JSValue -> Either String String
 parseInstance a =
-- 
1.7.10.4