vzcdn 0.2.2 → 0.2.3

data/test/test_reporting.rb

@@ -26,18 +26,19 @@ class TestRestApi < Test::Unit::TestCase
 
     @units = [{:Name => "units: mbps, ", :id => TrafficUnits::MBPS},
               {:Name => "units: GB, ", :id => TrafficUnits::GB}]
+    @srv = Reporting.do
   end
 
   def test_traffic_usage
     billing_month = @now - 50*24*60*60
     puts "traffic usage for billing month in " + billing_month.strftime("%Y-%m-01")
     @media_fhha.each { |media|
-      get_billing_regions.each { |region|
+      @srv.get_billing_regions.each { |region|
         region_name = region["Name"]
         if (region_name != "Global")
           @units.each { |units|
             puts media[:Name] + "region: " + region_name + ", " + units[:Name] + 
-              get_traffic_usage(media[:id], region["Id"], units[:id], billing_month).to_s
+            @srv.get_traffic_usage(media[:id], region["Id"], units[:id], billing_month).to_s
           }
         end
       }
@@ -47,96 +48,96 @@ class TestRestApi < Test::Unit::TestCase
   def test_report_codes
     puts "report codes"
     @media_afhha.each { |media|
-      puts media[:Name] + get_report_codes(media[:id]).to_s
+      puts media[:Name] + @srv.get_report_codes(media[:id]).to_s
     }
   end
     
   def test_maximum_storage_usage
     puts "maximum storage usage"
-    puts get_maximum_storage_usage(@now-7*24*60*60, @now)
+    puts @srv.get_maximum_storage_usage(@now-7*24*60*60, @now)
   end
 
   def test_download_activity
     puts "download activity"
     @media_fha.each { |media|
-      puts media[:Name] + get_download_activity(media[:id], @now-24*60*60, @now).to_s
+      puts media[:Name] + @srv.get_download_activity(media[:id], @now-24*60*60, @now).to_s
     }
   end
 
   def test_directory_activity
     puts "directory activity"
     @media_fha.each { |media|
-      puts media[:Name] + get_directory_activity(media[:id], @now-24*60*60, @now).to_s
+      puts media[:Name] + @srv.get_directory_activity(media[:id], @now-24*60*60, @now).to_s
     }
   end
 
   def test_xferred_interval
-    puts "all regions: " + get_data_transferred_by_platform_and_interval(nil, @now-30*60, @now, nil, nil).to_s 
-    regions = get_billing_regions
+    puts "all regions: " + @srv.get_data_transferred_by_platform_and_interval(nil, @now-30*60, @now, nil, nil).to_s 
+    regions = @srv.get_billing_regions
     regions.each { |region|
-      puts "region: " + region["Name"] + ", " + get_data_transferred_by_platform_and_interval(nil, @now-30*60, @now, region["Id"], nil).to_s 
+      puts "region: " + region["Name"] + ", " + @srv.get_data_transferred_by_platform_and_interval(nil, @now-30*60, @now, region["Id"], nil).to_s 
     }
-    puts "every 5 minutes: " + get_data_transferred_by_platform_and_interval(nil, @now-30*60, @now, nil, Interval::FIVE_MINUTE).to_s 
-    puts "every hour: " + get_data_transferred_by_platform_and_interval(nil, @now-10*60*60, @now, nil, Interval::HOURLY).to_s 
-    puts "every day: " + get_data_transferred_by_platform_and_interval(nil, @now-5*24*60*60, @now, nil, Interval::DAILY).to_s 
-    puts "flash media: " + get_data_transferred_by_platform_and_interval(MediaType::FLASH_MEDIA, @now-30*60, @now, nil, nil).to_s 
-    puts "http large: " + get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE, @now-30*60, @now, nil, nil).to_s 
-    puts "http large ssl only: " + get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE_SSL, @now-30*60, @now, nil, nil).to_s 
-    puts "http large dfw: " + get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE, @now-30*60, @now, nil, nil, "dfw").to_s 
-    puts "http large lax, dca, mia, dfw: " + get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE, @now-30*60, @now, nil, nil, "lax", "dca", "mia", "dfw").to_s 
-    puts "http small: " + get_data_transferred_by_platform_and_interval(MediaType::HTTP_SMALL, @now-30*60, @now, nil, nil).to_s 
-    puts "http small ssl only: " + get_data_transferred_by_platform_and_interval(MediaType::HTTP_SMALL_SSL, @now-30*60, @now, nil, nil).to_s 
-    puts "adn: " + get_data_transferred_by_platform_and_interval(MediaType::ADN, @now-30*60, @now, nil, nil).to_s
-    puts "adn ssl only: " + get_data_transferred_by_platform_and_interval(MediaType::ADN_SSL, @now-30*60, @now, nil, nil).to_s
+    puts "every 5 minutes: " + @srv.get_data_transferred_by_platform_and_interval(nil, @now-30*60, @now, nil, Interval::FIVE_MINUTE).to_s 
+    puts "every hour: " + @srv.get_data_transferred_by_platform_and_interval(nil, @now-10*60*60, @now, nil, Interval::HOURLY).to_s 
+    puts "every day: " + @srv.get_data_transferred_by_platform_and_interval(nil, @now-5*24*60*60, @now, nil, Interval::DAILY).to_s 
+    puts "flash media: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::FLASH_MEDIA, @now-30*60, @now, nil, nil).to_s 
+    puts "http large: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE, @now-30*60, @now, nil, nil).to_s 
+    puts "http large ssl only: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE_SSL, @now-30*60, @now, nil, nil).to_s 
+    puts "http large dfw: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE, @now-30*60, @now, nil, nil, "dfw").to_s 
+    puts "http large lax, dca, mia, dfw: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::HTTP_LARGE, @now-30*60, @now, nil, nil, "lax", "dca", "mia", "dfw").to_s 
+    puts "http small: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::HTTP_SMALL, @now-30*60, @now, nil, nil).to_s 
+    puts "http small ssl only: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::HTTP_SMALL_SSL, @now-30*60, @now, nil, nil).to_s 
+    puts "adn: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::ADN, @now-30*60, @now, nil, nil).to_s
+    puts "adn ssl only: " + @srv.get_data_transferred_by_platform_and_interval(MediaType::ADN_SSL, @now-30*60, @now, nil, nil).to_s
   end
 
   def test_xferred
-    puts "flash media: " + get_data_transferred_by_platform(MediaType::FLASH_MEDIA, @now-24*60*60, @now).to_s 
-    puts "http large: " + get_data_transferred_by_platform(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s 
-    # puts "http large ssl only: " + get_data_transferred_by_platform(MediaType::HTTP_LARGE_SSL, @now-24*60*60, @now).to_s 
-    puts "http large dfw: " + get_data_transferred_by_platform(MediaType::HTTP_LARGE, @now-24*60*60, @now, "dfw").to_s 
-    puts "http large lax, dca, mia, dfw: " + get_data_transferred_by_platform(MediaType::HTTP_LARGE, @now-24*60*60, @now, "lax", "dca", "mia", "dfw").to_s 
-    puts "http small: " + get_data_transferred_by_platform(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s 
-    # puts "http small ssl only: " + get_data_transferred_by_platform(MediaType::HTTP_SMALL_SSL, @now-24*60*60, @now).to_s 
-    puts "adn: " + get_data_transferred_by_platform(MediaType::ADN, @now-24*60*60, @now).to_s
-    # puts "adn ssl only: " + get_data_transferred_by_platform(MediaType::ADN_SSL, @now-24*60*60, @now).to_s
+    puts "flash media: " + @srv.get_data_transferred_by_platform(MediaType::FLASH_MEDIA, @now-24*60*60, @now).to_s 
+    puts "http large: " + @srv.get_data_transferred_by_platform(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s 
+    # puts "http large ssl only: " + @srv.get_data_transferred_by_platform(MediaType::HTTP_LARGE_SSL, @now-24*60*60, @now).to_s 
+    puts "http large dfw: " + @srv.get_data_transferred_by_platform(MediaType::HTTP_LARGE, @now-24*60*60, @now, "dfw").to_s 
+    puts "http large lax, dca, mia, dfw: " + @srv.get_data_transferred_by_platform(MediaType::HTTP_LARGE, @now-24*60*60, @now, "lax", "dca", "mia", "dfw").to_s 
+    puts "http small: " + @srv.get_data_transferred_by_platform(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s 
+    # puts "http small ssl only: " + @srv.get_data_transferred_by_platform(MediaType::HTTP_SMALL_SSL, @now-24*60*60, @now).to_s 
+    puts "adn: " + @srv.get_data_transferred_by_platform(MediaType::ADN, @now-24*60*60, @now).to_s
+    # puts "adn ssl only: " + @srv.get_data_transferred_by_platform(MediaType::ADN_SSL, @now-24*60*60, @now).to_s
   end
 
   def test_xferred_codes
-    puts "flash media: " + get_data_transferred_and_hits_by_custom_report_codes(MediaType::FLASH_MEDIA, @now-24*60*60, @now).to_s 
-    puts "http large: " + get_data_transferred_and_hits_by_custom_report_codes(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s 
-    puts "http small: " + get_data_transferred_and_hits_by_custom_report_codes(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s 
-    puts "adn: " + get_data_transferred_and_hits_by_custom_report_codes(MediaType::ADN, @now-24*60*60, @now).to_s 
+    puts "flash media: " + @srv.get_data_transferred_and_hits_by_custom_report_codes(MediaType::FLASH_MEDIA, @now-24*60*60, @now).to_s 
+    puts "http large: " + @srv.get_data_transferred_and_hits_by_custom_report_codes(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s 
+    puts "http small: " + @srv.get_data_transferred_and_hits_by_custom_report_codes(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s 
+    puts "adn: " + @srv.get_data_transferred_and_hits_by_custom_report_codes(MediaType::ADN, @now-24*60*60, @now).to_s 
   end
 
   def test_xferred_all
-    puts get_all_data_transferred(@now-24*60*60, @now)
-    puts get_all_data_transferred(@now-4*60*60, @now, "dfw")
-    puts get_all_data_transferred(@now-60*60, @now, "lax", "dca", "mia", "dfw")
+    puts @srv.get_all_data_transferred(@now-24*60*60, @now)
+    puts @srv.get_all_data_transferred(@now-4*60*60, @now, "dfw")
+    puts @srv.get_all_data_transferred(@now-60*60, @now, "lax", "dca", "mia", "dfw")
   end
 
   def test_customer_name
-    puts "customer name: " + get_customer_name.to_s
+    puts "customer name: " + @srv.get_customer_name.to_s
   end
 
   def test_account_number
-    # puts "account number: " + get_customer_account_number("NMK01").to_s
+    # puts "account number: " + @srv.get_customer_account_number("NMK01").to_s
   end
 
   def test_assec_activity
-    puts "flash media: " + get_asset_activity(MediaType::FLASH_MEDIA, @now-24*60*60, @now).to_s
-    puts "http large: " + get_asset_activity(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s
-    puts "http small: " + get_asset_activity(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s
-    puts "ADN: " + get_asset_activity(MediaType::ADN, @now-24*60*60, @now).to_s
+    puts "flash media: " + @srv.get_asset_activity(MediaType::FLASH_MEDIA, @now-24*60*60, @now).to_s
+    puts "http large: " + @srv.get_asset_activity(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s
+    puts "http small: " + @srv.get_asset_activity(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s
+    puts "ADN: " + @srv.get_asset_activity(MediaType::ADN, @now-24*60*60, @now).to_s
   end
 
   def test_status_activity
-    puts "http large: " + get_cache_status_activity(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s
-    puts "http small: " + get_cache_status_activity(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s
-    puts "ADN: " + get_cache_status_activity(MediaType::ADN, @now-24*60*60, @now).to_s
+    puts "http large: " + @srv.get_cache_status_activity(MediaType::HTTP_LARGE, @now-24*60*60, @now).to_s
+    puts "http small: " + @srv.get_cache_status_activity(MediaType::HTTP_SMALL, @now-24*60*60, @now).to_s
+    puts "ADN: " + @srv.get_cache_status_activity(MediaType::ADN, @now-24*60*60, @now).to_s
   end
 
   def test_storage_usage
-    puts "current_storage_usage: " + get_current_storage_usage.to_s
+    puts "current_storage_usage: " + @srv.get_current_storage_usage.to_s
   end
 end

data/test/unreachable.mock

@@ -0,0 +1,9 @@
+[
+  {
+    "url": "https://api.edgecast.com/v2/mcc/customers/BED3/dns/routezones",
+    "method": "get",
+    "body": null,
+    "response_code": -1,
+    "response_body": "Net::OpenTimeout exception occurred:execution expired"
+  }
+]

data/test/unreachable.results

@@ -0,0 +1,8 @@
+[
+{
+  "cmd": "ec zone list",
+  "stdout": "Problem invoking REST method at server https://api.edgecast.com/v2/\nERROR:Net::OpenTimeout exception occurred:execution expired\n",
+  "stderr": "",
+  "diff": ""
+}
+]

data/vzcdn.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rest-client", ">= 1.5"
-
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vzcdn
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Steve Preston
@@ -10,22 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +57,7 @@ files:
 - Rakefile
 - bin/ec
 - bin/vzcdn
+- lib/MockHttpResponse
 - lib/args.rb
 - lib/argtest.rb
 - lib/bind2zone.sh
@@ -81,9 +68,11 @@ files:
 - lib/config_handler.rb
 - lib/config_reader.rb
 - lib/diff.rb
+- lib/http_send.rb
 - lib/mediaManagment.rb
 - lib/method.rb
 - lib/mkbind.sh
+- lib/mock_http_send.rb
 - lib/print.rb
 - lib/proxy_credentials.rb
 - lib/realTimeStats.rb
@@ -102,10 +91,21 @@ files:
 - lib/zone_diff.rb
 - lib/zone_hc.rb
 - lib/zone_update.rb
-- pkg/vzcdn-0.0.1.gem
-- test/test_all.rb
+- test/bad-credentials.mock
+- test/bad-credentials.results
+- test/create_delete.mock
+- test/crud.mock
+- test/crud.results
+- test/initial.mock
+- test/initial.results
+- test/mk_mock.rb
+- test/mk_response.rb
+- test/push.mock
 - test/test_clui.rb
+- test/test_mock.rb
 - test/test_reporting.rb
+- test/unreachable.mock
+- test/unreachable.results
 - vzcdn.gemspec
 homepage: ''
 licenses:
@@ -132,6 +132,18 @@ signing_key:
 specification_version: 4
 summary: Command line UI for Edgecast api.
 test_files:
-- test/test_all.rb
+- test/bad-credentials.mock
+- test/bad-credentials.results
+- test/create_delete.mock
+- test/crud.mock
+- test/crud.results
+- test/initial.mock
+- test/initial.results
+- test/mk_mock.rb
+- test/mk_response.rb
+- test/push.mock
 - test/test_clui.rb
+- test/test_mock.rb
 - test/test_reporting.rb
+- test/unreachable.mock
+- test/unreachable.results

data/test/test_all.rb

@@ -1,2 +0,0 @@
-require 'test/unit'
-require_relative 'test_reporting'