pi 0.1.24 → 0.1.25

data/lib/cli/commands/dns.rb

@@ -5,9 +5,10 @@ module PI::Cli::Command
     
     def app_dns(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
 
-      dns = client.app_dns(app[:id])
+      dns = client.app_dns(appid)
       return display JSON.pretty_generate(dns) if @options[:json]
       return display "No DNS!" if dns.nil? || dns.empty?
       dns_table = table do |t|
@@ -21,19 +22,25 @@ module PI::Cli::Command
     
     def map_dns(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      dns = client.usable_dns(app[:id])
+      dnsname = @options[:dns]
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      dns = client.usable_dns(appid)
       err "No usable dns!" if dns.nil? || dns.empty?
-      choices = Array.new
-      dns.each do |s|
-        choices << s[:name]
+      if dnsname
+        tmp = dnsname.split(",")
+        manifest = Array.new
+        tmp.each do |t|
+          manifest.push(t)
+        end
+      else
+        manifest = asks "Select dns, indexed list?", :choices => dns.collect { |d| d[:name] }, :indexed => true
+        display "Selected dns: ",false
+        manifest.each do |m|
+          display "#{m} ",false
+        end
+        display "\n"
       end      
-      manifest = asks "Select dns, indexed list?", :choices => choices, :indexed => true
-      display "Selected dns: ",false
-      manifest.each do |m|
-        display "#{m} ",false
-      end 
-      display "\n"
       display "Mapping dns: ",false
       
       t = Thread.new do     
@@ -44,27 +51,161 @@ module PI::Cli::Command
       end
       end
       
-      client.map_dns(app[:id],manifest)
+      client.map_dns(appid,manifest)
       Thread.kill(t)
       display "OK".green   
     end  
     
     def unmap_dns(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      dns = client.app_dns(app[:id])
+      dnsname = @options[:dns]
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      dns = client.app_dns(appid)
       err "No mapped dns!" if dns.nil? || dns.empty? 
-      urls = asks "Select DNS", :choices => dns, :indexed => true  
-      display "Selected DNS: ",false
-      urls.each do |m|
-        display "#{m} ",false
-      end 
-      display "\n"
+      if dnsname 
+        urls = dnsname.split(",")
+      else
+        urls = asks "Select DNS", :choices => dns, :indexed => true
+        display "Selected DNS: ",false
+        urls.each do |m|
+          display "#{m} ",false
+        end
+        display "\n"
+      end
+      
       urls.each do |url|
-        do_unmap_dns(app[:id], url)
+        do_unmap_dns(appid, url)
       end  
     end
     
+    def dns
+      dns = client.dns
+      return display "No Services" if dns.nil? || dns.empty?        
+      return display JSON.pretty_generate(dns) if @options[:json]
+      dns.sort! {|a, b| a[:name] <=> b[:name] }
+      dns_table = table do |t|
+        t.headings = 'ID', 'DNS Name', 'Project Name', 'Description'
+        dns.each do |s|
+          t << [s[:id],s[:name], s[:projectName], s[:bak]]
+        end
+      end
+      display dns_table
+    end
+    
+    def create_dns(dnsname=nil)
+      projectname = @options[:project]
+      description = @options[:desc]
+      zoneid = @options[:zoneid]
+      dns_zone = client.dns_zone_list
+      err"No dns zone" if dns_zone.nil? || dns_zone.empty?
+      if zoneid
+        zoneid_flag = false
+        dns_zone.each do |d|
+          zoneid_flag = true if d[:id].to_s == zoneid
+        end
+        err"The dns zone id is not exist!" if zoneid_flag != true
+      end
+      projects = client.projects             
+      projectname = ask"Project name", :choices => projects.collect { |p| p[:name] }, :indexed => true  unless projectname 
+      projectid = nil
+      projects.each do |p|
+        projectid = p[:id] if p[:name] == projectname
+      end   
+      err "Invild project" if projectid.nil? 
+      unless zoneid
+        zonename = ask"Select dns zone", :choices => dns_zone.collect { |d| d[:name] }, :indexed => true
+        dns_zone.each do |d|
+          zoneid = d[:id] if d[:name] == zonename
+        end
+        err"Invalid zone" if zoneid.nil?
+      end
+      
+      loop{
+        dnsname = ask"DNS name" unless dnsname
+        tmp = client.verify_dns(dnsname, zoneid)
+        if not check_name_valid?(dnsname)
+          display "Invalid dns name '#{dnsname}'." 
+          dnsname =nil
+          next
+        else if tmp[1] == "false"
+          display "DNS '#{dnsname}' already exists." 
+          dnsname =nil
+          next
+        else
+          break
+          end
+        end
+      }   
+      # dnsname = dnsname.concat(".#{zone}")        
+      description = ask"Description", :default => nil unless description
+      manifest = {
+        :name        => dnsname,
+        :zoneId      => zoneid,
+        :projectId   => projectid,
+        :bak         => description
+      }
+      client.create_dns(manifest)
+      display"OK".green    
+    end
+    
+    def delete_dns(dnsid=nil)
+      unless dnsid
+        dnsid = choose_dnsid
+      end
+      client.delete_dns(dnsid)
+      display"OK".green
+    end
+    
+    def register_dns(dnsid=nil)
+      unless dnsid
+        dnsid = choose_dnsid
+      end
+      targets = client.usable_target(dnsid)
+      target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
+      continents = client.dns_continents
+      tmp = continents.values
+      tmp.sort! {|a, b| a <=> b }
+      continent = ask"Select continent", :choices => tmp.collect { |t| t }, :indexed => true
+      display "Select continent: #{continent}" 
+      continent = continents.index("#{continent}")
+      countries = client.dns_country(continent)
+      tmp = countries.values
+      tmp.sort! {|a, b| a <=> b }
+      country = ask"Select country", :choices => tmp.collect { |t| t }, :indexed => true
+      display "Select country: #{country}" 
+      country = countries.index("#{country}")
+      manifest = {
+        :continentName => continent,
+        :countryCode   => country
+      }
+      client.register_dns(dnsid, target, manifest)
+      display "OK".green
+    end
+    
+    def deregister_dns(dnsid=nil)
+      unless dnsid
+        dnsid = choose_dnsid
+      end
+
+      targets = client.usable_target(dnsid)
+      target = ask"Select target", :choices => targets.collect { |t| t[:targetName] }, :indexed => true
+      choices = Array.new
+      record = Array.new
+      targets.each do |t|
+        record = t[:records] if t[:targetName] == target
+      end
+      err"No record" if record.nil? || record.empty?
+      view = ask"Select record", :choices => record.collect { |t| t[:view] }, :indexed => true        
+      recordid = nil
+      record.each do |r|
+        recordid = r[:id] if r[:view] == view
+      end
+
+      client.deregister_dns(recordid)
+      display "OK".green
+    end
+    
     private
     
     def do_unmap_dns(appid, url)

data/lib/cli/commands/misc.rb

@@ -6,10 +6,19 @@ module PI::Cli::Command
     end
    
     def set_target(target_url)
-      target_url = "http://#{target_url}" unless /^https?/ =~ target_url
+      PI::Cli::Config.store_target(target_url)
+      if target_url =~ /(https?:\/\/)?staging.samsungcloud.org/
+        if /^https?/ =~ target_url
+          target_url = target_url.split("//", 2)
+          target_url = target_url[1]
+        end
+        target_url = "http://api.#{target_url}"
+      else
+        target_url = "http://#{target_url}" unless /^https?/ =~ target_url
+      end
       target_url = target_url.gsub(/\/+$/, '')
       client = PI::Client.new(target_url)
-      PI::Cli::Config.store_target(target_url)
+      # PI::Cli::Config.store_target(target_url)
     end
 
   end

data/lib/cli/commands/projects.rb

@@ -181,11 +181,7 @@ module PI::Cli::Command
         end
         err "The project is not found or not a java project! Project name :#{project}" unless flag
       else    
-        project_choices = Array.new
-        java_projects.each do |p|
-          project_choices << p[:name]
-        end
-        project = ask "Select Project", :choices => project_choices, :indexed => true
+        project = ask "Select Project", :choices => java_projects.collect { |j| j[:name] }, :indexed => true
         display "Selected Project: ",false
         display "#{project}"
       end
@@ -254,12 +250,8 @@ module PI::Cli::Command
         project = useproject[:name]
       end 
       binary = client.project_binary(project)
-      err "No binary!" if binary.nil? || binary.empty?
-      choices = Array.new
-      binary.each do |b|
-        choices << b[:versionName]
-      end       
-      binaryname = ask"Select Binary", :choices => choices, :indexed => true
+      err "No binary!" if binary.nil? || binary.empty?     
+      binaryname = ask"Select Binary", :choices => binary.collect { |b| b[:versionName] }, :indexed => true
       display "Selected Binary: ",false
       display "#{binaryname}"  
       binaryid = nil

data/lib/cli/commands/services.rb

@@ -5,8 +5,9 @@ module PI::Cli::Command
     
     def app_service(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      services = client.app_service(app[:id])
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      services = client.app_service(appid)
       return display JSON.pretty_generate(services) if @options[:json]
       return display "No Services" if services.nil? || services.empty?
       services.sort! {|a, b| a[:name] <=> b[:name] }
@@ -21,21 +22,27 @@ module PI::Cli::Command
     
     def bind_service(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      services = client.usable_services(app[:id])
+      service = @options[:service]
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      services = client.usable_services(appid)
       err "No usable services!" if services.nil? || services.empty?
       
-      choices = Array.new
-      services.each do |s|
-        choices << s[:name]
-      end 
-           
-      manifest = asks "Select services, indexed list?", :choices => choices, :indexed => true
-      display "Selected services: ",false
-      manifest.each do |m|
-        display "#{m} ",false
-      end 
-      display "\n"  
+      if service
+        tmp = service.split(",")
+        manifest = Array.new
+        tmp.each do |s|
+          manifest.push(s)
+        end
+      else
+        manifest = asks "Select services, indexed list?", :choices => services.collect { |s| s[:name] }, :indexed => true
+        display "Selected services: ",false
+        manifest.each do |m|
+          display "#{m} ",false
+        end
+        display "\n"
+      end
+        
       display "Binding service: ",false
       
       t = Thread.new do     
@@ -46,7 +53,7 @@ module PI::Cli::Command
       end
       end
       
-      client.bind_service(app[:id],manifest)
+      client.bind_service(appid,manifest)
       result = check_status(app[:targetName], app[:name], "bindservice")
       Thread.kill(t)
       if result[:code] == 200 
@@ -62,24 +69,153 @@ module PI::Cli::Command
     
     def unbind_service(appid_or_appname=nil)
       client.check_login_status
-      app = choose_app_help_target_not_all(appid_or_appname)
-      services = client.app_service(app[:id])
+      service = @options[:service]
+      app, appid = choose_app_help_target_not_all(appid_or_appname)
+      appid = (appid == nil ? app[:id] : appid)
+      services = client.app_service(appid)
       err "No binded services!" if services.nil? || services.empty?      
-      service_choices = Array.new
-      services.each do |s|
-        service_choices << s[:name]
-      end      
-      services = asks "Select Service", :choices => service_choices, :indexed => true
-      display "Selected DNS: ",false
-      services.each do |m|
-        display "#{m} ",false
-      end 
-      display "\n"
+      if service 
+        services = service.split(",")
+      else
+        services = asks "Select Service", :choices => services.collect { |s| s[:name] }, :indexed => true
+        display "Selected DNS: ",false
+        services.each do |m|
+          display "#{m} ",false
+        end
+        display "\n"
+      end
+      
       services.each do |service|
         do_unbind_service(app, service)
       end  
     end
     
+    def services
+      services = client.services
+      return display "No Services" if services.nil? || services.empty?        
+      return display JSON.pretty_generate(services) if @options[:json]
+      services.sort! {|a, b| a[:name] <=> b[:name] }
+      services_table = table do |t|
+        t.headings = 'ID', 'Name', 'Farm Name', 'Service Type', 'Version', 'Owner'
+        services.each do |s|
+          t << [s[:id],s[:name], s[:farmName], s[:type] ,s[:version], s[:ownerName]]
+        end
+      end
+      display services_table
+    end
+    
+    def service(serviceid=nil)     
+      if serviceid
+        services = client.services
+        err "No services" if services.nil? || services.empty?        
+        serviceid_flag = false
+        services.each do |s|
+          serviceid_flag = true if s[:id].to_s == serviceid
+        end
+        err"The service is not exist!" if serviceid_flag != true
+      else 
+        serviceid = choose_serviceid
+      end
+      service = client.service(serviceid)
+      return display "No Services" if service.nil? || service.empty?        
+      return display JSON.pretty_generate(service) if @options[:json]
+      display service[:new_data]
+    end
+    
+    def import_service(importurl=nil)
+      importurl = ask"Input the url to import" unless importurl
+      client.import_service(importurl) 
+      display"OK".green     
+    end
+    
+    def export_service(serviceid=nil)
+      unless serviceid
+        serviceid = choose_serviceid
+      end
+      serviceurl = client.export_service(serviceid)   
+      display "#{serviceurl[1]}"   
+    end
+    
+    def check_service(serviceid=nil)
+      unless serviceid
+        serviceid = choose_serviceid
+      end
+      check = client.check_service(serviceid)   
+      if check[1] == "true"  
+        display "Service is available." 
+      else
+        display "Service is unavailable."
+      end 
+    end
+    
+    def delete_service(serviceid=nil)
+      unless serviceid
+        serviceid = choose_serviceid
+      end
+      client.delete_service(serviceid)
+      display"OK".green  
+    end
+    
+    def register_service(serviceid=nil)
+      target = @options[:target]
+      servicetype = @options[:type]
+      if servicetype
+        err "Invalid type. Please use --type 1 or --type 2" unless servicetype =~ /[1|2]/
+      end
+      if serviceid
+        services = client.services
+        err "No services" if services.nil? || services.empty?        
+        serviceid_flag = false
+        services.each do |s|
+          serviceid_flag = true if s[:id].to_s == serviceid
+        end
+        err"The service is not exist!" if serviceid_flag != true
+      else 
+        serviceid = choose_serviceid
+      end      
+      targets = client.usable_target(serviceid)
+      err "No targets" if targets.nil? || targets.empty?
+      if target
+        target_flag = false
+        targets.each do |t|
+          target_flag = true if t[:name] == target
+        end
+        err"Invalid target name" if target_flag != true
+      else
+        target = ask"Select target", :choices => targets.collect { |t| t[:name] }, :indexed => true
+      end      
+      unless servicetype
+        choices = ["App Service", "Session Service"]
+        servicetype = ask"Select service type", :choices => choices, :indexed => true
+        if servicetype == "App Service" 
+          servicetype = 1
+        else
+          servicetype = 2
+        end
+      end
+      client.register_service(serviceid, target, servicetype)
+      display "OK".green
+    end
+    
+    def deregister_service(serviceid=nil)
+      servicetargetname = @options[:target]
+      unless serviceid
+        serviceid = choose_serviceid
+      end
+      service_target = client.service_target(serviceid)   
+      err"No target available to deregister" if service_target.nil? || service_target.empty?
+      unless servicetargetname
+        servicetargetname = ask"Select target", :choices => service_target.collect { |t| t[:targetName] }, :indexed => true
+      end
+      servicetargetid = nil
+      service_target.each do |s|
+        servicetargetid = s[:id] if servicetargetname == s[:targetName]
+      end
+      err " The service is not registered to this target!" if servicetargetid == nil
+      client.deregister_service(servicetargetid)
+      display "OK".green
+    end
+    
     private
     
     def do_unbind_service(app, service)