Improve cluster model, add some detail API calls

Author: Shirshendu Mukherjee

app/controllers/clusters_controller.rb

@@ -1,12 +1,16 @@
 class ClustersController < AuthenticatedUsersController
   get '/clusters' do
     clusters = Tendrl::Cluster.all
-    { clusters: ClusterPresenter.list(clusters) }.to_json
+    JSON.generate clusters: clusters
   end
 
   before '/clusters/:cluster_id/?*?' do
-    @cluster = Tendrl::Cluster.new(params[:cluster_id])
-    #@cluster.gd2.get("/ping")
+    @cluster = Tendrl::Cluster.find(params[:cluster_id])
+    raise Tendrl::HttpResponseErrorHandler.new(
+      StandardError.new,
+      cause: '/clusters/id',
+      object_id: params[:cluster_id]
+    )
   end
 
   get '/clusters/:cluster_id' do
@@ -24,41 +28,34 @@ class ClustersController < AuthenticatedUsersController
     { volumes: volumes }.to_json
   end
 
+  get '/clusters/:cluster_id/volumes/:volume_id' do
+    volume = @cluster.gd2.volumes(params[:volume_id])
+    { volume: volume }.to_json
+  end
+
+  get '/clusters/:cluster_id/volumes/:volume_id/bricks' do
+    bricks = @cluster.gd2.bricks(params[:volume_id])
+    { bricks: bricks }.to_json
+  end
+
   post '/import' do
     new_endpoint = {
-      gd2_url: parsed_body['gd2_url'],
-      secret: parsed_body['secret']
+      'gd2_url' => parsed_body['gd2_url'],
+      'secret' => parsed_body['secret']
     }
-    gd2 = Gd2Client.new new_endpoint
+    gd2 = Gd2Client.new new_endpoint.symbolize_keys
     state = gd2.state
     cluster = Tendrl::Cluster.new state['cluster-id']
     unless cluster.endpoints.include? new_endpoint
-      Tendrl.etcd.create_in_order(
-        "/clusters/#{state['cluster-id']}/endpoints",
-        value: new_endpoint.to_json
-      )
+      cluster.add_endpoint new_endpoint
     end
     status 201
     state.merge(endpoints: cluster.endpoints).to_json
   end
 
   #get '/clusters/:cluster_id/nodes/:node_id/bricks' do
-    #node = Tendrl::Node.find_by_cluster_id(
-      #params[:cluster_id], params[:node_id]
-    #)
-    #halt 404 unless node.present?
-    #bricks = Tendrl::Brick.find_all_by_cluster_id_and_node_fqdn(
-      #params[:cluster_id], node['fqdn']
-    #)
-    #{ bricks: BrickPresenter.list(bricks) }.to_json
-  #end
-
-  #get '/clusters/:cluster_id/volumes/:volume_id/bricks' do
-    #references = Tendrl::Brick.find_refs_by_cluster_id_and_volume_id(
-      #params[:cluster_id], params[:volume_id]
-    #)
-    #bricks = Tendrl::Brick.find_by_cluster_id_and_refs(params[:cluster_id], references)
-    #{ bricks: BrickPresenter.list(bricks) }.to_json
+    #bricks = @cluster.gd2.get("/endpoints")
+    #{ bricks: bricks }.to_json
   #end
 
   #get '/clusters/:cluster_id/notifications' do

app/models/cluster.rb

@@ -7,48 +7,41 @@ def initialize(cluster_id)
     end
 
     def endpoints
-      Tendrl.etcd.get(
+      @endpoints ||= Tendrl.etcd.get(
         "/clusters/#{@uuid}/endpoints", recursive: true
       ).children.map(&:value).sort.uniq.map { |e| JSON.parse e }
+    rescue Etcd::KeyNotFound
+      []
     end
 
     def gd2
-      @gd2 ||= Gd2Client.from_endpoint endpoints.sample
+      @gd2 ||= endpoints.map { |e| Gd2Client.from_endpoint e }.find(&:ping?)
     end
 
-    class << self
-      def exist?(cluster_id)
-        Tendrl.etcd.get "/clusters/#{cluster_id}"
-      rescue Etcd::KeyNotFound => e
-        raise Tendrl::HttpResponseErrorHandler.new(
-          e, cause: '/clusters/id', object_id: cluster_id
-        )
-      end
+    def to_json(_)
+      gd2.state.merge(endpoints: endpoints).to_json
+    end
 
+    def add_endpoint(endpoint)
+      Tendrl.etcd.create_in_order(
+        "/clusters/#{@uuid}/endpoints",
+        value: endpoint.to_json
+      )
+      @endpoints = nil
+    end
+
+    class << self
       def find(cluster_id)
-        attributes = {}
-        begin
-          attributes = Tendrl.recurse(
-            Tendrl.etcd.get(
-              "/clusters/#{cluster_id}", recursive: true
-            )
-          )[cluster_id]
-        rescue Etcd::KeyNotFound
-          raise Tendrl::HttpResponseErrorHandler.new(
-            e, cause: '/clusters/id', object_id: cluster_id
-          )
-        end
-        new(attributes)
+        cluster = new(cluster_id)
+        return nil unless cluster.gd2.present?
       end
 
       def all
-        begin
-          Tendrl.etcd.get('/clusters', recursive: true).children.map do |cluster|
-            Tendrl.recurse(cluster)
-          end
-        rescue Etcd::KeyNotFound
-          []
+        Tendrl.etcd.get('/clusters').children.map do |etcd_node|
+          Cluster.new File.basename(etcd_node.key)
         end
+      rescue Etcd::KeyNotFound
+        []
       end
     end
   end

app/models/peer.rb

@@ -53,6 +53,18 @@ def volumes
   end
 
   def volume(vol_name)
-    get("/v1/volumes#{vol_name}")
+    get("/v1/volumes/#{vol_name}")
+  end
+
+  def bricks(vol_name)
+    get("/v1/volumes/#{vol_name}/bricks")
+  end
+
+  def ping?
+    HTTParty.get(@gd2_url + "/ping").success?
+  end
+
+  def endpoints
+    get('/endpoints')
   end
 end

lib/gd2_client.rb

@@ -153,7 +153,6 @@ def unmarshall!(attrs)
 require './app/models/job'
 require './app/models/volume'
 require './app/models/brick'
-require './app/models/peer'
 
 # Forms
 require './app/forms/user_form'