vcloud-core 0.7.0 → 0.8.0

data/spec/vcloud/{fog_spec.rb → core/fog_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Vcloud::Fog do
+describe Vcloud::Core::Fog do
   describe "fog_credentials_pass" do
-    let(:subject) { Vcloud::Fog::fog_credentials_pass }
+    let(:subject) { Vcloud::Core::Fog::fog_credentials_pass }
 
     context "vcloud_director_password not set" do
       it "should return nil" do

data/spec/vcloud/core/login_cli_spec.rb

@@ -50,7 +50,7 @@ describe Vcloud::Core::LoginCli do
         end
 
         it "should prompt on stderr so that stdout can be scripted and mask password input" do
-          expect(Vcloud::Fog::Login).to receive(:token_export).with(pass)
+          expect(Vcloud::Core::Fog::Login).to receive(:token_export).with(pass)
           expect(subject.stderr).to eq("vCloud password: " + "*" * pass.size)
         end
       end
@@ -61,7 +61,7 @@ describe Vcloud::Core::LoginCli do
         end
 
         it "should write stderr message to say that it's reading from pipe and not echo any input" do
-          expect(Vcloud::Fog::Login).to receive(:token_export).with(pass)
+          expect(Vcloud::Core::Fog::Login).to receive(:token_export).with(pass)
           expect(subject.stderr).to eq("Reading password from pipe..")
         end
       end
@@ -71,7 +71,7 @@ describe Vcloud::Core::LoginCli do
       let(:args) { %w{--version} }
 
       it "should not call Login" do
-        expect(Vcloud::Fog::Login).not_to receive(:token_export)
+        expect(Vcloud::Core::Fog::Login).not_to receive(:token_export)
       end
 
       it "should print version and exit normally" do
@@ -84,7 +84,7 @@ describe Vcloud::Core::LoginCli do
       let(:args) { %w{--help} }
 
       it "should not call Login" do
-        expect(Vcloud::Fog::Login).not_to receive(:token_export)
+        expect(Vcloud::Core::Fog::Login).not_to receive(:token_export)
       end
 
       it "should print usage and exit normally" do
@@ -97,7 +97,7 @@ describe Vcloud::Core::LoginCli do
   describe "incorrect usage" do
     shared_examples "print usage and exit abnormally" do |error|
       it "should not call Login" do
-        expect(Vcloud::Fog::Login).not_to receive(:token_export)
+        expect(Vcloud::Core::Fog::Login).not_to receive(:token_export)
       end
 
       it "should print error message and usage" do
@@ -133,7 +133,7 @@ describe Vcloud::Core::LoginCli do
       let(:exception_string) { 'something went horribly wrong' }
 
       it "should print error without backtrace and exit abnormally" do
-        expect(Vcloud::Fog::Login).to receive(:token_export).
+        expect(Vcloud::Core::Fog::Login).to receive(:token_export).
           and_raise(exception_string)
         if STDIN.tty?
           expect(subject.stderr).to eq("vCloud password: #{'*' * pass.size}\n#{exception_string}")

data/spec/vcloud/core/org_vdc_network_spec.rb

@@ -11,7 +11,7 @@ module Vcloud
         @vdc_name  = 'test-vdc-1'
         @net_name  = 'test-net-1'
         @mock_fog_interface = StubFogInterface.new
-        allow(Vcloud::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
+        allow(Vcloud::Core::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
         allow_any_instance_of(Vdc).to receive(:id).and_return(@vdc_id)
         @mock_vdc = double(:vdc, :id => @vdc_id)
         allow(Vdc).to receive(:get_by_name).and_return(@mock_vdc)

data/spec/vcloud/core/query_runner_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Vcloud::Core::QueryRunner do
   before(:each) do
     @mock_fog_interface = StubFogInterface.new
-    allow(Vcloud::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
+    allow(Vcloud::Core::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
     @query_runner = Vcloud::Core::QueryRunner.new()
   end
 

data/spec/vcloud/core/vapp_spec.rb

@@ -6,7 +6,7 @@ module Vcloud
       before(:each) do
         @vapp_id = 'vapp-12345678-1234-1234-1234-000000111111'
         @mock_fog_interface = StubFogInterface.new
-        allow(Vcloud::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
+        allow(Vcloud::Core::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
       end
 
       context "Class public interface" do

data/spec/vcloud/core/vapp_template_spec.rb

@@ -7,7 +7,7 @@ module Vcloud
       before(:each) do
         @id = 'vappTemplate-12345678-1234-1234-1234-000000234121'
         @mock_fog_interface = StubFogInterface.new
-        allow(Vcloud::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
+        allow(Vcloud::Core::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
       end
 
       context "Class public interface" do

data/spec/vcloud/core/vdc_spec.rb

@@ -7,7 +7,7 @@ module Vcloud
       before(:each) do
         @vdc_id = '12345678-1234-1234-1234-000000111232'
         @mock_fog_interface = StubFogInterface.new
-        allow(Vcloud::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
+        allow(Vcloud::Core::Fog::ServiceInterface).to receive(:new).and_return(@mock_fog_interface)
       end
 
       context "Class public interface" do

data/spec/vcloud/core/vm_spec.rb

@@ -21,7 +21,7 @@ module Vcloud
         @mock_vm_cpu_count = 1
         @fog_interface = StubFogInterface.new
         @mock_vapp = double(:vappm, :name => @vapp_name, :id => @vapp_id)
-        allow(Vcloud::Fog::ServiceInterface).to receive(:new).and_return(@fog_interface)
+        allow(Vcloud::Core::Fog::ServiceInterface).to receive(:new).and_return(@fog_interface)
         allow(@fog_interface).to receive(:get_vapp).with(@vm_id).and_return({
             :name => "#{@vm_name}",
             :href => "vm-href/#{@vm_id}",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vcloud-core
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -192,15 +192,20 @@ files:
 - bin/vcloud-login
 - bin/vcloud-query
 - jenkins.sh
-- jenkins_integration_tests.sh
 - jenkins_tests.sh
 - lib/vcloud/core.rb
+- lib/vcloud/core/api_interface.rb
 - lib/vcloud/core/compute_metadata.rb
 - lib/vcloud/core/config_loader.rb
 - lib/vcloud/core/config_validator.rb
 - lib/vcloud/core/edge_gateway.rb
 - lib/vcloud/core/edge_gateway_interface.rb
 - lib/vcloud/core/entity.rb
+- lib/vcloud/core/fog.rb
+- lib/vcloud/core/fog/fog_constants.rb
+- lib/vcloud/core/fog/login.rb
+- lib/vcloud/core/fog/model_interface.rb
+- lib/vcloud/core/fog/service_interface.rb
 - lib/vcloud/core/login_cli.rb
 - lib/vcloud/core/metadata_helper.rb
 - lib/vcloud/core/org_vdc_network.rb
@@ -213,19 +218,15 @@ files:
 - lib/vcloud/core/version.rb
 - lib/vcloud/core/vm.rb
 - lib/vcloud/fog.rb
-- lib/vcloud/fog/content_types.rb
-- lib/vcloud/fog/login.rb
-- lib/vcloud/fog/model_interface.rb
-- lib/vcloud/fog/relation.rb
-- lib/vcloud/fog/service_interface.rb
+- lib/vcloud/temporary_fog_classes.rb
 - spec/integration/README.md
 - spec/integration/core/edge_gateway_spec.rb
+- spec/integration/core/fog/login_manual.rb
+- spec/integration/core/fog/login_spec.rb
 - spec/integration/core/query_runner_spec.rb
 - spec/integration/core/vapp_spec.rb
 - spec/integration/core/vdc_spec.rb
 - spec/integration/core/vm_spec.rb
-- spec/integration/fog/login_manual.rb
-- spec/integration/fog/login_spec.rb
 - spec/integration/vcloud_tools_testing_config.yaml.template
 - spec/spec_helper.rb
 - spec/support/integration_helper.rb
@@ -242,6 +243,10 @@ files:
 - spec/vcloud/core/data/working_with_defaults.yaml
 - spec/vcloud/core/edge_gateway_interface_spec.rb
 - spec/vcloud/core/edge_gateway_spec.rb
+- spec/vcloud/core/fog/fog_model_interface_spec.rb
+- spec/vcloud/core/fog/login_spec.rb
+- spec/vcloud/core/fog/service_interface_spec.rb
+- spec/vcloud/core/fog_spec.rb
 - spec/vcloud/core/login_cli_spec.rb
 - spec/vcloud/core/metadata_helper_spec.rb
 - spec/vcloud/core/org_vdc_network_spec.rb
@@ -252,10 +257,6 @@ files:
 - spec/vcloud/core/vapp_template_spec.rb
 - spec/vcloud/core/vdc_spec.rb
 - spec/vcloud/core/vm_spec.rb
-- spec/vcloud/fog/fog_model_interface_spec.rb
-- spec/vcloud/fog/login_spec.rb
-- spec/vcloud/fog/service_interface_spec.rb
-- spec/vcloud/fog_spec.rb
 - vcloud-core.gemspec
 homepage: http://github.com/gds-operations/vcloud-core
 licenses:
@@ -278,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 622735401989777949
+      hash: 2495951714182978305
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -288,12 +289,12 @@ summary: Core tools for interacting with VMware vCloud Director
 test_files:
 - spec/integration/README.md
 - spec/integration/core/edge_gateway_spec.rb
+- spec/integration/core/fog/login_manual.rb
+- spec/integration/core/fog/login_spec.rb
 - spec/integration/core/query_runner_spec.rb
 - spec/integration/core/vapp_spec.rb
 - spec/integration/core/vdc_spec.rb
 - spec/integration/core/vm_spec.rb
-- spec/integration/fog/login_manual.rb
-- spec/integration/fog/login_spec.rb
 - spec/integration/vcloud_tools_testing_config.yaml.template
 - spec/spec_helper.rb
 - spec/support/integration_helper.rb
@@ -310,6 +311,10 @@ test_files:
 - spec/vcloud/core/data/working_with_defaults.yaml
 - spec/vcloud/core/edge_gateway_interface_spec.rb
 - spec/vcloud/core/edge_gateway_spec.rb
+- spec/vcloud/core/fog/fog_model_interface_spec.rb
+- spec/vcloud/core/fog/login_spec.rb
+- spec/vcloud/core/fog/service_interface_spec.rb
+- spec/vcloud/core/fog_spec.rb
 - spec/vcloud/core/login_cli_spec.rb
 - spec/vcloud/core/metadata_helper_spec.rb
 - spec/vcloud/core/org_vdc_network_spec.rb
@@ -320,7 +325,3 @@ test_files:
 - spec/vcloud/core/vapp_template_spec.rb
 - spec/vcloud/core/vdc_spec.rb
 - spec/vcloud/core/vm_spec.rb
-- spec/vcloud/fog/fog_model_interface_spec.rb
-- spec/vcloud/fog/login_spec.rb
-- spec/vcloud/fog/service_interface_spec.rb
-- spec/vcloud/fog_spec.rb

data/jenkins_integration_tests.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-
-# FIXME: Change the Carrenza job to use the following script directly.
-./jenkins_tests.sh

data/lib/vcloud/fog/content_types.rb

@@ -1,18 +0,0 @@
-module Vcloud
-  module Fog
-    module ContentTypes
-      ORG = 'application/vnd.vmware.vcloud.org+xml'
-      VDC = 'application/vnd.vmware.vcloud.vdc+xml'
-      NETWORK = 'application/vnd.vmware.vcloud.network+xml'
-      METADATA = 'application/vnd.vmware.vcloud.metadata.value+xml'
-    end
-
-    module MetadataValueType
-      String = 'MetadataStringValue'
-      Number = 'MetadataNumberValue'
-      DateTime = 'MetadataDateTimeValue'
-      Boolean = 'MetadataBooleanValue'
-    end
-
-  end
-end

data/lib/vcloud/fog/login.rb

@@ -1,38 +0,0 @@
-require 'fog'
-
-module Vcloud
-  module Fog
-    module Login
-      class << self
-        def token(pass)
-          check_plaintext_pass
-          token = get_token(pass)
-
-          return token
-        end
-
-        def token_export(*args)
-          return "export #{Vcloud::Fog::TOKEN_ENV_VAR_NAME}=#{token(*args)}"
-        end
-
-        private
-
-        def check_plaintext_pass
-          pass = Vcloud::Fog::fog_credentials_pass
-          unless pass.nil? || pass.empty?
-            raise "Found plaintext #{Vcloud::Fog::FOG_CREDS_PASS_NAME} entry. Please set it to an empty string"
-          end
-        end
-
-        def get_token(pass)
-          ENV.delete(Vcloud::Fog::TOKEN_ENV_VAR_NAME)
-          vcloud = ::Fog::Compute::VcloudDirector.new({
-            Vcloud::Fog::FOG_CREDS_PASS_NAME => pass,
-          })
-
-          return vcloud.vcloud_token
-        end
-      end
-    end
-  end
-end

data/lib/vcloud/fog/model_interface.rb

@@ -1,33 +0,0 @@
-module Vcloud
-  module Fog
-    class ModelInterface
-      def initialize
-        @vcloud = ::Fog::Compute::VcloudDirector.new
-      end
-
-      def org_name
-        @vcloud.org_name
-      end
-
-      def current_organization
-        @vcloud.organizations.get_by_name org_name
-      end
-
-      def current_vdc vdc_id
-        current_organization.vdcs.detect { |v| v.id == vdc_id }
-      end
-
-      def get_vm_by_href href
-        vm = @vcloud.get_vms_in_lease_from_query(
-            {
-                :filter => "href==#{href}"
-            }).body[:VMRecord].first
-        return nil unless vm
-        vdc = current_vdc(vm[:vdc].split('/').last)
-        vapp = vdc.vapps.get_by_name(vm[:containerName])
-        vapp.vms.first
-      end
-
-    end
-  end
-end

data/lib/vcloud/fog/relation.rb

@@ -1,8 +0,0 @@
-module Vcloud
-  module Fog
-    module RELATION
-      PARENT = 'up'
-      CHILD = 'down'
-    end
-  end
-end

data/lib/vcloud/fog/service_interface.rb

@@ -1,245 +0,0 @@
-require 'forwardable'
-
-module Vcloud
-  module Fog
-    class ServiceInterface
-      extend Forwardable
-
-      def_delegators :@fog, :get_vapp, :organizations, :org_name, :delete_vapp, :vcloud_token, :end_point,
-                     :get_execute_query, :get_vapp_metadata, :power_off_vapp, :shutdown_vapp, :session,
-                     :post_instantiate_vapp_template, :put_memory, :put_cpu, :power_on_vapp, :put_vapp_metadata_value,
-                     :put_vm, :get_edge_gateway, :get_network_complete, :delete_network, :post_create_org_vdc_network,
-                     :post_configure_edge_gateway_services, :get_vdc, :post_undeploy_vapp
-
-      #########################
-      # FogFacade Inner class to represent a logic free facade over our interactions with Fog
-
-      class FogFacade
-        def initialize
-          @vcloud = ::Fog::Compute::VcloudDirector.new
-        end
-
-        def get_vdc(id)
-          @vcloud.get_vdc(id).body
-        end
-
-        def get_organization (id)
-          @vcloud.get_organization(id).body
-        end
-
-        def session
-          @vcloud.get_current_session.body
-        end
-
-        def get_vapps_in_lease_from_query(options)
-          @vcloud.get_vapps_in_lease_from_query(options).body
-        end
-
-        def post_instantiate_vapp_template(vdc, template, name, params)
-          Vcloud::Core.logger.debug("instantiating #{name} vapp in #{vdc[:name]}")
-          vapp = @vcloud.post_instantiate_vapp_template(extract_id(vdc), template, name, params).body
-          @vcloud.process_task(vapp[:Tasks][:Task])
-          @vcloud.get_vapp(extract_id(vapp)).body
-        end
-
-        def put_memory(vm_id, memory)
-          Vcloud::Core.logger.debug("putting #{memory}MB memory into VM #{vm_id}")
-          task = @vcloud.put_memory(vm_id, memory).body
-          @vcloud.process_task(task)
-        end
-
-        def get_vapp(id)
-          @vcloud.get_vapp(id).body
-        end
-
-        def put_network_connection_system_section_vapp(vm_id, section)
-          task = @vcloud.put_network_connection_system_section_vapp(vm_id, section).body
-          @vcloud.process_task(task)
-        end
-
-        def put_cpu(vm_id, cpu)
-          Vcloud::Core.logger.debug("putting #{cpu} CPU(s) into VM #{vm_id}")
-          task = @vcloud.put_cpu(vm_id, cpu).body
-          @vcloud.process_task(task)
-        end
-
-        def put_vm(id, name, options={})
-          Vcloud::Core.logger.debug("updating name : #{name}, :options => #{options} in vm : #{id}")
-          task = @vcloud.put_vm(id, name, options).body
-          @vcloud.process_task(task)
-        end
-
-        def vcloud_token
-          @vcloud.vcloud_token
-        end
-
-        def end_point
-          @vcloud.end_point
-        end
-
-        def put_guest_customization_section_vapp(vm_id, customization_req)
-          task = @vcloud.put_guest_customization_section_vapp(vm_id, customization_req).body
-          @vcloud.process_task(task)
-        end
-
-        def get_execute_query(type=nil, options={})
-          @vcloud.get_execute_query(type, options).body
-        end
-
-        def get_vapp_metadata(id)
-          @vcloud.get_vapp_metadata(id).body
-        end
-
-
-        def organizations
-          @vcloud.organizations
-        end
-
-        def org_name
-          @vcloud.org_name
-        end
-
-        def post_undeploy_vapp(vapp_id)
-          task = @vcloud.post_undeploy_vapp(vapp_id).body
-          @vcloud.process_task(task)
-        end
-
-        def delete_vapp(vapp_id)
-          task = @vcloud.delete_vapp(vapp_id).body
-          @vcloud.process_task(task)
-        end
-
-        def get_network_complete(id)
-          @vcloud.get_network_complete(id).body
-        end
-
-        def delete_network(id)
-          task = @vcloud.delete_network(id).body
-          @vcloud.process_task(task)
-        end
-
-        def post_create_org_vdc_network(vdc_id, name, options)
-          Vcloud::Core.logger.debug("creating #{options[:fence_mode]} OrgVdcNetwork #{name} in vDC #{vdc_id}")
-          attrs = @vcloud.post_create_org_vdc_network(vdc_id, name, options).body
-          @vcloud.process_task(attrs[:Tasks][:Task])
-          get_network_complete(extract_id(attrs))
-        end
-
-        def post_configure_edge_gateway_services(edgegw_id, config)
-          Vcloud::Core.logger.info("Updating EdgeGateway #{edgegw_id}")
-          begin
-            task = @vcloud.post_configure_edge_gateway_services(edgegw_id, config).body
-            @vcloud.process_task(task)
-          rescue => ex
-            Vcloud::Core.logger.error("Could not update EdgeGateway #{edgegw_id} : #{ex}")
-            raise
-          end
-        end
-
-        def power_off_vapp(vapp_id)
-          task = @vcloud.post_power_off_vapp(vapp_id).body
-          @vcloud.process_task(task)
-        end
-
-        def power_on_vapp(vapp_id)
-          Vcloud::Core.logger.debug("Powering on vApp #{vapp_id}")
-          task = @vcloud.post_power_on_vapp(vapp_id).body
-          @vcloud.process_task(task)
-        end
-
-        def shutdown_vapp(vapp_id)
-          task = @vcloud.post_shutdown_vapp(vapp_id).body
-          @vcloud.process_task(task)
-        end
-
-        def put_vapp_metadata_value(id, k, v)
-          Vcloud::Core.logger.debug("putting metadata pair '#{k}'=>'#{v}' to #{id}")
-          # need to convert key to_s since Fog 0.17 borks on symbol key
-          task = @vcloud.put_vapp_metadata_item_metadata(id, k.to_s, v).body
-          @vcloud.process_task(task)
-        end
-
-        def get_edge_gateway(id)
-          @vcloud.get_edge_gateway(id).body
-        end
-
-        private
-        def extract_id(link)
-          link[:href].split('/').last
-        end
-      end
-      #
-      #########################
-
-
-
-      def initialize (fog = FogFacade.new)
-        @fog = fog
-      end
-
-      def org
-        link = session[:Link].select { |l| l[:rel] == RELATION::CHILD }.detect do |l|
-          l[:type] == ContentTypes::ORG
-        end
-        @fog.get_organization(link[:href].split('/').last)
-      end
-
-      def get_vapp_by_name_and_vdc_name name, vdc_name
-        response_body = @fog.get_vapps_in_lease_from_query({:filter => "name==#{name}"})
-        response_body[:VAppRecord].detect { |record| record[:vdcName] == vdc_name }
-      end
-
-      def vdc(name)
-        link = org[:Link].select { |l| l[:rel] == RELATION::CHILD }.detect do |l|
-          l[:type] == ContentTypes::VDC && l[:name] == name
-        end
-        raise "vdc #{name} cannot be found" unless link
-        @fog.get_vdc(link[:href].split('/').last)
-
-      end
-
-      def put_network_connection_system_section_vapp(vm_id, section)
-        begin
-          Vcloud::Core.logger.debug("adding NIC into VM #{vm_id}")
-          @fog.put_network_connection_system_section_vapp(vm_id, section)
-        rescue => ex
-          Vcloud::Core.logger.error("failed to put_network_connection_system_section_vapp for vm #{vm_id}: #{ex}")
-          Vcloud::Core.logger.debug("requested network section : #{section.inspect}")
-          raise
-        end
-      end
-
-      def find_networks(network_names, vdc_name)
-        network_names.collect do |network|
-          vdc(vdc_name)[:AvailableNetworks][:Network].detect do |l|
-            l[:type] == ContentTypes::NETWORK && l[:name] == network
-          end
-        end
-      end
-
-      def put_guest_customization_section(vm_id, vm_name, script)
-        begin
-          Vcloud::Core.logger.debug("configuring guest customization section for vm : #{vm_id}")
-          customization_req = {
-            :Enabled             => true,
-            :CustomizationScript => script,
-            :ComputerName        => vm_name
-          }
-          @fog.put_guest_customization_section_vapp(vm_id, customization_req)
-        rescue => ex
-          Vcloud::Core.logger.error("Failed to update guest customization section: #{ex}")
-          Vcloud::Core.logger.debug("=== interpolated preamble:")
-          Vcloud::Core.logger.debug(script)
-          raise
-        end
-      end
-
-      private
-      def extract_id(link)
-        link[:href].split('/').last
-      end
-
-    end
-
-  end
-end