egi-fedcloud-cloudhound 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53b9e447d5ff5c639e1ed13116b39f2d3d86dd77
-  data.tar.gz: 6019140b5a86e42f0f6c70e5cbe96991582fe1cc
+  metadata.gz: 9d6d1e60e2fbc93b5e6d6747ea4373ffe878d9fc
+  data.tar.gz: b17621e8590fe41fef073fd3751b200ce49c00ce
 SHA512:
-  metadata.gz: b0d2c1a3919ea1625bafbfb04e7e04b467482ce6d4cb2b24fd72000b6e551aac46fef1e138885b104447238bd26ce9144527e97d03d3e44baf9840eede2bf41e
-  data.tar.gz: c5902b4cae877356fa73948b00bea14ac51af3c944d52a71505daec59d1531d78dd92be6152844a87ce838398d7c8e8ca0a62ea012977095b333fc5519d376f8
+  metadata.gz: 63b816bef03b604dcf574a783480e1bab4a52af61d0cda94fb4f91c0e0fc23946b945ed0f81ee25d6e3860814eb0ea3c1a169966b48bce9fb83aefbc6632e7b9
+  data.tar.gz: 7a61a4cd04db86768da65fbbdb59f14cb8b41e629e67b9a1c736b202d2cf559afe5bb7ae8ff35d901c1f037357649a25ec5ccf5266e12f00f7e9dadcec22a566

data/bin/egi-fedcloud-cloudhound

@@ -22,6 +22,29 @@ require 'egi-fedcloud-cloudhound'
 class EgiFedcloudCloudhound < Thor
   include Thor::Actions
 
+  desc "all", "Prints information for all available cloud sites"
+  method_option :credentials, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.credentials,
+                :aliases => '-c', :desc => 'PEM file with a personal certificate and private key'
+  method_option :password, :type => :string, :default => nil,
+                :aliases => '-p', :desc => 'PEM private key password'
+  method_option :ca_path, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.ca_path,
+                :aliases => '-x', :desc => 'Directory path to all trusted CA certificates'
+  method_option :gocdb_base_url, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.gocdb_base_url,
+                :aliases => '-g', :desc => 'GOCDB endpoint URL'
+  method_option :appdb_base_url, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.appdb_base_url,
+                :aliases => '-a', :desc => 'AppDB API endpoint URL'
+  method_option :debug, :type => :boolean, :default => Egi::Fedcloud::Cloudhound::Settings.debug,
+                :aliases => '-d', :desc => 'Enable debugging'
+  def all
+    init_log options[:debug]
+
+    $stdout.puts Egi::Fedcloud::Cloudhound::Formatter.as_table(
+      Egi::Fedcloud::Cloudhound::Extractor.find_all(
+        options
+      )
+    )
+  end
+
   desc "ip IP_ADDRESS", "Prints information based on the provided IP address or IP address range"
   method_option :credentials, :type => :string, :default => Egi::Fedcloud::Cloudhound::Settings.credentials,
                 :aliases => '-c', :desc => 'PEM file with a personal certificate and private key'

data/lib/egi/fedcloud/cloudhound/extractor.rb

@@ -16,6 +16,20 @@ class Egi::Fedcloud::Cloudhound::Extractor
       @@appdb ||= Egi::Fedcloud::Cloudhound::Appdb.new(options, password)
     end
 
+    #
+    def find_all(options = {})
+      init options
+
+      Egi::Fedcloud::Cloudhound::Log.debug "[#{self}] Searching for all cloud-related contacts"
+
+      sites = @@gocdb.cloud_sites
+      sites.compact!
+
+      Egi::Fedcloud::Cloudhound::Log.debug "[#{self}] Found #{sites.count} cloud sites"
+
+      sites.collect { |site| site.contacts }
+    end
+
     #
     def find_by_ip(ip, options = {})
       init options

data/lib/egi/fedcloud/cloudhound/gocdb.rb

@@ -3,6 +3,7 @@ require 'ox'
 #
 class Egi::Fedcloud::Cloudhound::Gocdb < Egi::Fedcloud::Cloudhound::Connector
 
+  GOCDB_SERVICE_ENDPOINT = '/gocdbpi/public/?method=get_service_endpoint'
   GOCDB_SITES_URL = '/gocdbpi/private/?method=get_site'
   GOCDB_PROD_SITES_URL = "#{GOCDB_SITES_URL}&production_status=Production"
   GOCDB_CERT_PROD_SITES_URL = "#{GOCDB_PROD_SITES_URL}&certification_status=Certified"
@@ -10,8 +11,8 @@ class Egi::Fedcloud::Cloudhound::Gocdb < Egi::Fedcloud::Cloudhound::Connector
   CLOUD_SERVICE_TYPES = [
     "eu.egi.cloud.vm-management.occi",
     "eu.egi.cloud.storage-management.cdmi",
-    "eu.egi.cloud.accounting",
-    "eu.egi.cloud.information.bdii",
+#    "eu.egi.cloud.accounting",
+#    "eu.egi.cloud.information.bdii",
     "eu.egi.cloud.vm.metadata-vmcatcher",
   ]
 
@@ -37,6 +38,21 @@ class Egi::Fedcloud::Cloudhound::Gocdb < Egi::Fedcloud::Cloudhound::Connector
     get_and_parse GOCDB_CERT_PROD_SITES_URL, 'cert_prod_sites'
   end
 
+  #
+  def cloud_sites
+    sites.select { |site| cloud_site_names.include?(site.name) }
+  end
+
+  #
+  def production_cloud_sites
+    production_sites.select { |site| cloud_site_names.include?(site.name) }
+  end
+
+  #
+  def certified_production_cloud_sites
+    certified_production_sites.select { |site| cloud_site_names.include?(site.name) }
+  end
+
   private
 
   #
@@ -50,4 +66,22 @@ class Egi::Fedcloud::Cloudhound::Gocdb < Egi::Fedcloud::Cloudhound::Connector
 
     results
   end
+
+  #
+  def cloud_site_names
+    return @cached_cloud_site_names if instance_variable_defined?('@cached_cloud_site_names')
+    site_names = Set.new
+
+    Egi::Fedcloud::Cloudhound::Log.debug "[#{self.class}] Pulling service endpoints from #{GOCDB_SERVICE_ENDPOINT.inspect}"
+    xmldoc_service_endpoints = Ox.parse retrieve(GOCDB_SERVICE_ENDPOINT)
+    xmldoc_service_endpoints.locate("results/*").each do |service_endpoint|
+      service_endpoint.locate("SERVICE_TYPE").each do |service_type|
+        next unless service_type && CLOUD_SERVICE_TYPES.include?(service_type.text)
+        service_endpoint.locate("SITENAME").each { |service_site_name| site_names << service_site_name.text }
+      end
+    end
+    instance_variable_set('@cached_cloud_site_names', site_names.to_a)
+
+    @cached_cloud_site_names
+  end
 end

data/lib/egi/fedcloud/cloudhound/version.rb

@@ -2,7 +2,7 @@ module Egi
   module Fedcloud
     module Cloudhound
       # Versioning constant
-      VERSION = "0.0.1" unless defined?(::Egi::Fedcloud::Cloudhound::VERSION)
+      VERSION = "0.0.2" unless defined?(::Egi::Fedcloud::Cloudhound::VERSION)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egi-fedcloud-cloudhound
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Boris Parak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport