vzcdn 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7308b4c03e37ceb4e8929e429f5ea3cdf4b5a879
-  data.tar.gz: 76b3478d0d082d625bbd17e43aa0c86dfda8ee18
+  metadata.gz: e8cf5a8765894451f57b2419a20e69fbfa1187d8
+  data.tar.gz: 3100211e9da6d904a6592deabb9495bf4dcbcb6e
 SHA512:
-  metadata.gz: 6b241986733b7fd7b4be2823a01269aaae95a6e161714783ceb8349ac084a8284dd1b0a0861739e4e3e61afa7278a88d3da230bcecca79df8d9122fb87ec1e3c
-  data.tar.gz: 097f7f170f2a0bb6a41d6c838058c69c72522db5cd560ab42d1ee22a39c0a26f969653c250881db92901443d746f1aa0798b6285f66947ad149fc4232ce03cc9
+  metadata.gz: e9fece79699a66aa2478849826c711078a80029fda078f5a19dc04315435a6d42b98e1aeaaaedcb3e2040890ed57c4c55668319fa219c7edba480fe28bc0af06
+  data.tar.gz: 8c029ca1fd312e13784f001ca7b3c0ea73c19f0b305eae60e50eb66d9f33cfd6ccdcc7d6862f33e8d6747fcf563cc8ced7eb3bbd392a5bf1d07b153d5be5d421

data/README.md

@@ -3,6 +3,9 @@
 Commandline UI for Edgecast API
 
 ##RELEASE NOTES
+2014/05/21      0.2.3
+  * Testcases added.
+
 2014/05/15      0.2.2
  * Bug fix: pull command would fail if zones directory does not exists.
 

data/lib/MockHttpResponse

@@ -0,0 +1,6 @@
+--url:https://api.edgecast.com/v2/mcc/customers/BED3/dns/routezones,method:get
+[{"DomainName":"mockzone.","Status":1,"Version":1400171377,"ZoneId":5385,"ZoneType":1},{"DomainName":"nitin.","Status":1,"Version":1400096702,"ZoneId":5284,"ZoneType":1},{"DomainName":"pythonzone.","Status":1,"Version":1400169998,"ZoneId":5366,"ZoneType":1},{"DomainName":"vdmstest.com.","Status":1,"Version":1398108874,"ZoneId":4980,"ZoneType":1}]
+--url:https://api.edgecast.com/v2/mcc//dns/routezonestatus,method:get
+[{"Id"=>1, "Name"=>"Active"}, {"Id"=>2, "Name"=>"Inactive"}]
+--url:https://api.edgecast.com/v2/mcc//dns/routezonetypes,method:get
+[{"Id"=>1, "Name"=>"CNAME"}, {"Id"=>2, "Name"=>"Subdomain"}, {"Id"=>3, "Name"=>"Zone"}]

data/lib/common.rb

@@ -1,7 +1,8 @@
-require 'rest_client'
 require 'json'
 require 'config_reader'
 require_relative 'proxy_credentials'
+require_relative 'http_send'
+require_relative 'mock_http_send'
 
 class CommonRestUtils
   include ConfigReader
@@ -9,51 +10,29 @@ class CommonRestUtils
     url = @uri_prefix + url_suffix
     if (body)
       json_body = JSON.pretty_generate body
+    else
+      json_body = nil
     end
     begin
-      response =
-        case http_method
-        when :put
-          RestClient.put(url, json_body, @headers)
-        when :get
-          RestClient.get(url, @headers)
-        when :post
-          RestClient.post(url, json_body, @headers)
-        when :delete
-          RestClient.delete(url, @headers)
-        else
-          "unsupported http method:" + http_method
-        end
+      if ($mock_env)
+        code, response = MockHttpSend.new($mock_env).send(url, http_method, @headers, json_body)
+      else
+        code, response = HttpSend.new.send(url, http_method, @headers, json_body)
+      end
     rescue Exception => e
-      puts "Problem executing REST command to server " + param("rest_base_url")
+      puts "Exception thrown by HttpSend.new.send(); should not occur"
       puts e.message
-      puts "#{e.response}"
-      proxy_auth_req = (e.message =~ /\A407 /)
-      if e.message =~ /\A407 /
-        ProxyCredentials.proxy_credentials param("proxy")
-        if @proxy_retries && @proxy_retries > 3
-          raise e.message + " too many retries"
-        else
-          @proxy_retries = @proxy_retries ? @proxy_retries + 1 : 1
-          return callMethod(url_suffix, http_method, body)
-        end  
-      end
-      exit
-      if $debug > 0
-        puts "full URL is:" + url
-        if (body)
-          puts "body is: json_body"
-        end
-      end
-      raise e.message + " (" + e.class.to_s + ")"
+      raise e.message + " (#{e.class})"
     end
-    if ( ! response.nil? && response.respond_to?(:code) && response.code != 200)
-      raise "Bad response code:" + response.code.to_s
-    end
-    if (response.length > 0)
-      if $debug > 1
-        File.open("raw.json", "w").write(response)
+    if code != 200
+      puts "Problem invoking REST method at server #{param "rest_base_url"}"
+      if code > 0
+        raise "Bad http response code: #{code} --- response:#{response}"
+      else
+        raise response
       end
+    end
+    if (response.length >= 2)
       JSON.parse response
     else
       nil
@@ -62,13 +41,9 @@ class CommonRestUtils
 
   def initialize(uri_prefix)
     @uri_prefix = uri_prefix
-    proxy = param("proxy")
-    if proxy != ""
-      RestClient.proxy = proxy
-    end
-    @headers = {:Content_type => "Application/json",
-      :Authorization => "TOK:" + param("token"),
-      :Accept => "Application/json"}
+    @headers = {"Content-Type" => "Application/json",
+      "Authorization" => "TOK:" + param("token"),
+      "Accept" => "Application/json"}
   end
 
 

data/lib/config_handler.rb

@@ -1,8 +1,12 @@
-require 'util'
+require_relative 'util'
+require_relative 'method'
 
 class ConfigHandler
   CONFIG_DIRECTORY = ".vdms.d"
   CONFIG_FILENAME = "config"
+  AUTHORS='SCP & NMK'
+  PASSWORD='Password'
+  @@config_values = nil
 
   def get_config_file
     if (! File.directory?(CONFIG_DIRECTORY))
@@ -26,13 +30,13 @@ class ConfigHandler
         new_file.puts(line)
       end
     }
-    if ( ! wrote_line)
+    if ( ! wrote_line && ! value.nil?)
       new_file.puts(new_config_line)
     end
   end
 
   def load_config_values
-    if defined? @@config_values
+    if @@config_values.class == Hash
       return
     else
       @@config_values = {}
@@ -46,6 +50,9 @@ class ConfigHandler
         end
         name, value = Util.parse_line(line)
         if value
+          if name.end_with? PASSWORD
+            value = Methodical.new(AUTHORS).backward value
+          end
           @@config_values[name] = value
         end
       }
@@ -65,6 +72,9 @@ class ConfigHandler
   end
 
   def set(name, value)
+    if value && name.end_with?(PASSWORD)
+      value = Methodical.new(AUTHORS).forward value
+    end
     config_file = get_config_file
     if ! File.exists? config_file
       # make empty file
@@ -78,6 +88,7 @@ class ConfigHandler
     orig_file.close
     FileUtils.rm(config_file, force: true)
     FileUtils.mv(new_config_file, config_file, :force => true)
+    @@config_values = nil
   end
 
   def delete(name)

data/lib/http_send.rb

@@ -0,0 +1,110 @@
+require_relative 'proxy_credentials'
+require 'net/http'
+
+class HttpSend
+  include ConfigReader
+
+  def get_proxy_params
+    @proxy = param("proxy")
+    @proxy_username = param("proxy-Username")
+    @proxy_password = param("proxy-Password")
+  end
+
+  def initialize
+    get_proxy_params
+  end
+
+  def set_headers(request, headers)
+    headers.each { |name, value|
+      request[name.to_s] = value
+    }
+  end
+
+  def create_request(uri, method)
+    case method
+    when :put
+      request = Net::HTTP::Put.new(uri)
+    when :get
+      request = Net::HTTP::Get.new(uri)
+    when :post
+      request = Net::HTTP::Post.new(uri)
+    when :delete
+      request = Net::HTTP::Delete.new(uri)
+    end
+  end
+
+  def adjust(http, uri)
+    # http.set_debug_output $stderr
+    http.read_timeout = 60
+    http.open_timeout = 60
+    if uri.scheme == 'https'
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+  end
+
+  def save_http(url, method, body, response_code, response_body)
+    if File.exists? $http_save_file
+      array = JSON.parse(File.open($http_save_file).read)
+    else
+      array = [ ]
+    end
+    o = Hash.new
+    o["url"] = url
+    o["method"] = method
+    o["body"] = body
+    o["response_code"] = response_code
+    o["response_body"] = response_body
+    array << o
+    file = File.open($http_save_file + ".tmp", "w")
+    file.write(JSON.pretty_generate(array))
+    file.close
+    FileUtils.mv($http_save_file + ".tmp", $http_save_file, :force => true)
+  end
+
+  def send(url, method, headers, body = nil)
+    uri = URI(url)
+    request = create_request(uri, method)
+    if body
+      request.body = body
+    end
+    set_headers(request, headers)
+    if @proxy
+      proxy_uri = URI(@proxy)
+      http = Net::HTTP.new(uri.host, uri.port, proxy_uri.hostname, proxy_uri.port, @proxy_username, @proxy_password)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
+    end
+    adjust(http, uri)
+    response_code = -1
+    response_body = nil
+    begin
+      response = http.request(request)
+      response_code = response.code.to_i
+      response_body = response.body
+    rescue Net::HTTPServerException => e
+      if e.message == '407 "Proxy Authentication Required"'
+        ProxyCredentials.proxy_credentials(@proxy)
+        get_proxy_params
+        return self.retry(url, method, headers, body)
+      else
+        response_body = "#{e.class} exception occurred:#{e.message}"
+      end
+    rescue Exception => e
+      response_body = "#{e.class} exception occurred:#{e.message}"
+    end
+    if defined? $http_save_file
+      save_http(url, method, body, response_code, response_body)
+    end
+    return response_code, response_body
+  end
+
+  def retry(url, method, headers, body)
+    if @proxy_retries && @proxy_retries > 1
+      raise "Proxy Authentication Failed"
+    else
+      @proxy_retries = @proxy_retries ? @proxy_retries + 1 : 1
+      send(url, method, headers, body)
+    end
+  end
+end

data/lib/method.rb

@@ -1,5 +1,26 @@
-class Method
-  def initialize(args)
-    
+require 'openssl'
+require 'base64'
+
+class Methodical
+  ALPHABET = 'abcdefghiklmnoprstuvwxyz'
+
+  def initialize(severence)
+    @severence = severence[0...8]
+    @runner = OpenSSL::Cipher::Cipher.new("des-ede3-cbc")
+  end
+
+  def forward(string)
+    @runner.encrypt
+    @runner.key = ALPHABET
+    @runner.iv = @severence
+    Base64.encode64(@severence + @runner.update(string) + @runner.final).gsub(/\n/, '')
+  end
+
+  def backward(string)
+    @runner.decrypt
+    @runner.key = ALPHABET
+    encrypted = Base64.decode64(string)
+    @runner.iv = encrypted.slice!(0,8)
+    @runner.update(encrypted) + @runner.final
   end
 end

data/lib/mock_http_send.rb

@@ -0,0 +1,15 @@
+class MockHttpSend
+  def initialize(mockfile)
+    @mock_results = JSON.parse(File.open(mockfile).read)
+  end
+
+  def send(url, method, headers=nil, body = nil)
+    @mock_results.each { |result|
+      if result["url"] == url && result["method"] == method.to_s
+        return result["response_code"], result["response_body"]
+      end
+    }
+    return -1, "unable to find match for #{url},#{method} in mock file"
+  end
+end
+

data/lib/print.rb

@@ -3,6 +3,8 @@ require_relative 'util'
 require_relative 'config_reader'
 
 class TablePrint
+  include ConfigReader
+
   DELIM = '|'
 
   def char_repeat(n, char)
@@ -179,6 +181,9 @@ class TablePrint
     # will lines fit in terminal
     width_needed = maxwidth.reduce(:+) + (@ncols-1) * 2
     term_width, h = Util.detect_terminal_size
+    if param('mock-env') != ''
+      term_width = 1000000
+    end
     if (width_needed <= term_width)
       print_table_normally(maxwidth)
     else

data/lib/proxy_credentials.rb

@@ -1,8 +1,9 @@
-require 'net/http'
 require 'rubygems/user_interaction'
+require_relative 'config_handler'
 
 class ProxyCredentials
   include Gem::UserInteraction
+
   def self.proxy_credentials(proxy)
     new.get_credentials(proxy)
   end
@@ -14,17 +15,8 @@ class ProxyCredentials
     proxy_port = uri.port
     proxy_user = ask("username:")
     proxy_password = ask_for_password("password:")
-
-    uri = URI("http://blogsearch.google.com/ping/RPC2")
-    req = Net::HTTP::Get.new(uri)
-    net = Net::HTTP.new(uri.hostname, uri.port, proxy_host, proxy_port, proxy_user, proxy_password)
-    puts "created net"
-    net.read_timeout = 20
-    net.open_timeout = 20
-
-    net.start { |http|
-      response = http.request(req)
-      puts "response code from internet web service is #{response.code}, message is #{response.message}"
-    }
+    config = ConfigHandler.new
+    config.set("proxy-Username", proxy_user)
+    config.set("proxy-Password", proxy_password)
   end
 end

data/lib/reporting.rb

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
-require_relative 'common.rb'
-require 'cgi'
-
-URI_PREFIX="https://api.edgecast.com/v2/reporting/"
-URI_CUSTOMERS_SEGMENT = "customers/" + ACCT_NUM + "/"
+require_relative 'config_reader'
+require_relative 'common'
 
 module Interval
   FIVE_MINUTE = 1
@@ -16,113 +13,132 @@ module TrafficUnits
   GB = 2
 end
 
-def to_csv(prefix, pops_list)
-  result = ""
-  if (pops_list.count > 0)
-    result = prefix + pops_list[0]
-    pops_list.shift
-    pops_list.each { |pop|
-      result = result + "," + pop
-    }
+class Reporting
+  include ConfigReader
+
+  @@instance = nil
+
+  def self.do
+    @@instance ? @@instance : @@instance = Reporting.new
   end
-  result
-end
 
-def time_to_q(time)
-  time.strftime("%Y-%m-%dT%H:%M:%S")
-end
+  def initialize
+    rest_base_url = param("rest_base_url")
+    if (rest_base_url.nil? || rest_base_url.length == 0)
+      raise "configuration file does not contain expected parameters -- try config init"
+    end
+    @common = CommonRestUtils.new(rest_base_url + "reporting/")
+    @uri_customers_segment = "customers/" + param("acct-num") + "/"
+  end
 
-def interval(begin_time, end_time)
-  "?begindate=" + time_to_q(begin_time) + "&enddate=" + time_to_q(end_time)
-end
+  def to_csv(prefix, pops_list)
+    result = ""
+    if (pops_list.count > 0)
+      result = prefix + pops_list[0]
+      pops_list.shift
+      pops_list.each { |pop|
+        result = result + "," + pop
+      }
+    end
+    result
+  end
 
-def customer_suffix(word)
-  URI_CUSTOMERS_SEGMENT + word
-end
+  def time_to_q(time)
+    time.strftime("%Y-%m-%dT%H:%M:%S")
+  end
 
-def interval_suffix(word, begin_time, end_time)
-  URI_CUSTOMERS_SEGMENT + word + interval(begin_time, end_time)
-end
+  def interval(begin_time, end_time)
+    "?begindate=" + time_to_q(begin_time) + "&enddate=" + time_to_q(end_time)
+  end
 
-def media_suffix(media_type, word, begin_time, end_time)
-  URI_CUSTOMERS_SEGMENT + "media/" + media_type.to_s + "/" + word + interval(begin_time, end_time)
-end
+  def customer_suffix(word)
+    @uri_customers_segment + word
+  end
 
-def get_all_data_transferred(begin_time, end_time, *pops)
-  callMethod(interval_suffix("bytestransferred", begin_time, end_time) + to_csv("&pops=", pops), :get)
-end
+  def interval_suffix(word, begin_time, end_time)
+    @uri_customers_segment + word + interval(begin_time, end_time)
+  end
 
-def get_asset_activity(media_type, begin_time, end_time)
-  callMethod(media_suffix(media_type, "filestats", begin_time, end_time), :get)
-end
+  def media_suffix(media_type, word, begin_time, end_time)
+    @uri_customers_segment + "media/" + media_type.to_s + "/" + word + interval(begin_time, end_time)
+  end
 
-def get_billing_regions
-  callMethod("billing/regions", :get)
-end
+  def get_all_data_transferred(begin_time, end_time, *pops)
+    @common.callMethod(interval_suffix("bytestransferred", begin_time, end_time) + to_csv("&pops=", pops), :get)
+  end
 
-def get_cache_status_activity(media_type, begin_time, end_time)
-  callMethod(media_suffix(media_type, "cachestats", begin_time, end_time), :get)
-end
+  def get_asset_activity(media_type, begin_time, end_time)
+    @common.callMethod(media_suffix(media_type, "filestats", begin_time, end_time), :get)
+  end
 
-def get_current_storage_usage
-  callMethod(customer_suffix("lateststorageusage"), :get)
-end
+  def get_billing_regions
+    @common.callMethod("billing/regions", :get)
+  end
 
-def get_customer_account_number(custom_id)
-  callMethod("customers/accountnumber?customercustomid=" + CGI.escape(custom_id), :get)
-end
+  def get_cache_status_activity(media_type, begin_time, end_time)
+    @common.callMethod(media_suffix(media_type, "cachestats", begin_time, end_time), :get)
+  end
 
-def get_customer_name
-  callMethod(customer_suffix("customername"), :get)
-end
+  def get_current_storage_usage
+    @common.callMethod(customer_suffix("lateststorageusage"), :get)
+  end
 
-def get_data_transferred_and_hits_by_custom_report_codes(media_type, begin_time, end_time)
-  callMethod(media_suffix(media_type, "cnamereportcodes", begin_time, end_time), :get)
-end
+  def get_customer_account_number(custom_id)
+    @common.callMethod("customers/accountnumber?customercustomid=" + custom_id, :get)
+  end
 
-def get_data_transferred_by_platform(media_type, begin_time, end_time, *pops)
-  callMethod(media_suffix(media_type, "bytestransferred", begin_time, end_time) + to_csv("&pops=", pops), :get)
-end
+  def get_customer_name
+    @common.callMethod(customer_suffix("customername"), :get)
+  end
 
-def get_data_transferred_by_platform_and_interval(media_type, begin_time, end_time, region_id, interval_id, *pops)
-  suffix = interval_suffix("bytestransferred/interval", begin_time, end_time);
-  if (media_type)
-    suffix = suffix + "&mediatypeid=" + media_type.to_s
+  def get_data_transferred_and_hits_by_custom_report_codes(media_type, begin_time, end_time)
+    @common.callMethod(media_suffix(media_type, "cnamereportcodes", begin_time, end_time), :get)
   end
-  if (interval_id)
-    suffix = suffix + "&intervalid=" + interval_id.to_s
+
+  def get_data_transferred_by_platform(media_type, begin_time, end_time, *pops)
+    @common.callMethod(media_suffix(media_type, "bytestransferred", begin_time, end_time) + to_csv("&pops=", pops), :get)
   end
-  suffix = suffix + to_csv("&pops=", pops)
-  if (region_id)
-    suffix = suffix + "&regionid=" + region_id.to_s
+
+  def get_data_transferred_by_platform_and_interval(media_type, begin_time, end_time, region_id, interval_id, *pops)
+    suffix = interval_suffix("bytestransferred/interval", begin_time, end_time);
+    if (media_type)
+      suffix = suffix + "&mediatypeid=" + media_type.to_s
+    end
+    if (interval_id)
+      suffix = suffix + "&intervalid=" + interval_id.to_s
+    end
+    suffix = suffix + to_csv("&pops=", pops)
+    if (region_id)
+      suffix = suffix + "&regionid=" + region_id.to_s
+    end
+    puts "suffix: " + suffix
+    @common.callMethod(suffix, :get)
   end
-  puts "suffix: " + suffix
-  callMethod(suffix, :get)
-end
 
-def get_directory_activity(media_type, begin_time, end_time)
-  callMethod(media_suffix(media_type, "directorystats", begin_time, end_time), :get)
-end
+  def get_directory_activity(media_type, begin_time, end_time)
+    @common.callMethod(media_suffix(media_type, "directorystats", begin_time, end_time), :get)
+  end
 
-def get_download_activity(media_type, begin_time, end_time)
-  callMethod(media_suffix(media_type, "completedownloads", begin_time, end_time), :get)
-end
+  def get_download_activity(media_type, begin_time, end_time)
+    @common.callMethod(media_suffix(media_type, "completedownloads", begin_time, end_time), :get)
+  end
 
-def get_maximum_storage_usage(begin_time, end_time)
-  callMethod(interval_suffix("maxstorageusage", begin_time, end_time), :get)
-end
+  def get_maximum_storage_usage(begin_time, end_time)
+    @common.callMethod(interval_suffix("maxstorageusage", begin_time, end_time), :get)
+  end
 
-def get_report_codes(media_type)
-  suffix = customer_suffix("reportcodes")
-  if (media_type)
-    suffix = suffix + "?mediatypeid=" + media_type.to_s
+  def get_report_codes(media_type)
+    suffix = customer_suffix("reportcodes")
+    if (media_type)
+      suffix = suffix + "?mediatypeid=" + media_type.to_s
+    end
+    @common.callMethod(suffix, :get)
   end
-  callMethod(suffix, :get)
-end
 
-def get_traffic_usage(media_type, region_id, units, billing_month)
-  suffix = URI_CUSTOMERS_SEGMENT +
-    "media/" + media_type.to_s + "/region/" + region_id.to_s + "/units/" + units.to_s + "/trafficusage" +
-    "?begindate=" + billing_month.strftime("%Y-%m-01")
-  callMethod(suffix, :get)
+  def get_traffic_usage(media_type, region_id, units, billing_month)
+    suffix = @uri_customers_segment +
+      "media/" + media_type.to_s + "/region/" + region_id.to_s + "/units/" + units.to_s + "/trafficusage" +
+      "?begindate=" + billing_month.strftime("%Y-%m-01")
+    @common.callMethod(suffix, :get)
+  end
 end