fog-maestrodev 1.18.0.20131219193542 → 1.19.0.20131219203941

data/README.md

@@ -176,25 +176,10 @@ spec.add_dependency 'fog', '~> 1.16'
 * Ask specific questions on [Stack Overflow](http://stackoverflow.com/questions/tagged/fog)
 * Report bugs and discuss potential features in [Github issues](https://github.com/fog/fog/issues).
 
-## Getting Involved
+## Contributing
 
-New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+Please refer to [CONTRIBUTING.md](https://github.com/fog/fog/blob/master/CONTRIBUTING.md).
 
-### Coding
+## License
 
-* Pick a task:
-  * Offer feedback on open [pull requests](https://github.com/fog/fog/pulls).
-  * Review open [issues](https://github.com/fog/fog/issues) for things to help on.
-  * [Create an issue](https://github.com/fog/fog/issues/new) to start a discussion on additions or features.
-* Fork the project, add your changes and tests to cover them in a topic branch.
-* Commit your changes and rebase against `fog/fog` to ensure everything is up to date.
-* [Submit a pull request](https://github.com/fog/fog/compare/)
-
-### Non-Coding
-
-* Offer feedback on open [issues](https://github.com/fog/fog/issues).
-* Write and help edit [documentation](https://github.com/fog/fog.github.com).
-* Translate [documentation](https://github.com/fog/fog.github.com) in to other languages.
-* Organize or volunteer at events.
-* [Donate](https://www.gittip.com/geemus/)
-* Discuss other ideas for contribution with [geemus](mailto:geemus+fog@gmail.com).
+Please refer to [LICENSE.md](https://github.com/fog/fog/blob/master/LICENSE.md).

data/changelog.txt

@@ -1,3 +1,265 @@
+1.19.0 12/19/2013 15180fd7c0993f7fe6cfdc861a4db7ada14825ad
+==========================================================
+
+Stats! { 'collaborators' => 53, 'downloads' => 3970307, 'forks' => 1015, 'open_issues' => 149, 'watchers' => 2831 }
+
+MVP! Mike Pountney
+
+[AWS]
+  add modify_vpc_attribute. thanks Eric Stonfer
+  add modify_vpc_attribute. thanks Eric Stonfer
+
+[AWS|Autoscaling]
+  Fix option name in documentation. thanks Frederick Cheung
+
+[AWS|RDS]
+  Support for creating and removing subnet groups. thanks Akshay Joshi
+
+[AWS|Storage]
+  fixed signed urls when using session tokens. thanks Frederick Cheung
+
+[Brightbox]
+  Fix test issue with reusing servers. thanks Paul Thornthwaite
+  Add new SSL cert metadata attributes. thanks Paul Thornthwaite
+  Remove commented resource from schema. thanks Paul Thornthwaite
+  Fix typo in yard tag. thanks Paul Thornthwaite
+  Clean up Cloud IP mapping code. thanks Paul Thornthwaite
+  Code style clean up. thanks Paul Thornthwaite
+
+[OS|Volume]
+  Add listing/showing volume types. thanks Grzesiek Kolodziejczyk
+
+[aws]
+  Implement missing mocks for Route 53. thanks Carlos Sanchez
+  style fix for address model. thanks Eric Stonfer
+  narrow scope of unf warning. thanks geemus
+
+[aws:storage]
+  path_style option availability. thanks David Illsley
+
+[aws|cloudwatch]
+  remove :host key from request. thanks Brian D. Burns
+
+[aws|dns]
+  Don't set mock changes to INSYNC immediately, only after some timeout. thanks Carlos Sanchez
+
+[aws|elb]
+  support for cross zone load balancing. thanks Frederick Cheung
+
+[aws|rds]
+  Implement `ready?` for subnet group. thanks Akshay Joshi
+  Support Iops parameter. thanks Eric Hankins
+
+[aws|sqs]
+  remove host/port from request. thanks geemus
+
+[aws|storage]
+  warn/load unf as needed. thanks geemus
+
+[bluebox]
+  remove :host from excon request. thanks Sam Cooper
+
+[core]
+  use Excon :persistent option. thanks Brian D. Burns
+
+[digitalocean]
+  Add support for private networking. thanks Trae Robrock
+
+[dnsimple]
+  remove host from request. thanks Jose Luis Salas
+
+[general]
+  Allow default wait_for interval to be overiden globally. thanks radekg
+  Merge Forg.interval and Fog.timeout into a single file. thanks radekg
+
+[google]
+  natIP is set to true when it must be an ip. thanks Carlos Sanchez
+  Add support for instance tags. thanks Carlos Sanchez
+  Add support for instance tags. thanks Carlos Sanchez
+  Raise Fog::Errors::NotFound on 404. thanks Carlos Sanchez
+  Implement disk mocks and enable tests. thanks Carlos Sanchez
+  Alias flavor_id and machine_type for consistency with other providers. thanks Carlos Sanchez
+  Instances are created without description, and disk size is ignored. thanks Carlos Sanchez
+  Implement operation model. thanks Carlos Sanchez
+
+[hp]
+  Add documentation and examples for the provider for HP Cloud Services. thanks Rupak Ganguly
+  Fix links in some documentation pages. thanks Rupak Ganguly
+  Fix a few more documentation page links. thanks Rupak Ganguly
+  Fix connection section for newer services. thanks Rupak Ganguly
+
+[misc]
+  Get VcloudDirector working again in fog interactive. Fixes #2373. thanks Adam Heinz
+  Use OpenSSL::Digest instead of deprecated OpenSSL::Digest::Digest. thanks Akira Matsuda
+  Add new AWS EC2 flavors to the compute model. thanks Alfred Moreno
+  Add exponential backoff to backoff_if_unfound. thanks Andrew Leonard
+  add in 'AssociatePublicIpAddress' to launch configuration creation. thanks Andrew Stangl
+  merge upstream changes and resolve merge conflict. thanks Andrew Stangl
+  add in 'AssociatePublicIpAddress' to launch configuration creation. thanks Andrew Stangl
+  remove duplicate code introduced during rebase. thanks Andrew Stangl
+  tidy up and remove whitespace. thanks Andrew Stangl
+  use original error message if none given. thanks Brian D. Burns
+  use Fog::JSON. thanks Brian D. Burns
+  Add ready? method to aws VPC and Subnet models. thanks Brian Nelson
+  Add pending -> available transitions for AWS VPC and Subnets. thanks Brian Nelson
+  all? not working in JRuby 1.7.5+. Configure Travis. thanks Carlos Sanchez
+  Disable specific tests that don't pass on jruby 1.7.5+. thanks Carlos Sanchez
+  Disable coveralls on travis with jruby. thanks Carlos Sanchez
+  Ensure vpc created in a test doesn't affect another. thanks Carlos Sanchez
+  Allows custom username for aws spot instances. thanks Casey Abernathy
+  Added content_encoding attribute to Rackspace storage. thanks Cezar Sa Espinola
+  Remove :host key in RDS request method to eliminate excon warning. thanks David Faber
+  Remove stray private key. thanks Dominic Cleal
+  Update excon dependency to version ~>0.30.0. thanks Erik Michaels-Ober
+  Fix typo in documentation. thanks Erik Michaels-Ober
+  ecloud api version bump. thanks Eugene Howe
+  Lock user by default. thanks Evan Light
+  Updated docs to reflect RackConnect compatibility. thanks Evan Light
+  Typo. thanks Evan Light
+  service attribute conflicts with the service defined in the parent. thanks Evan Petrie
+  details sometimes fails with a not-found. thanks Evan Petrie
+  Add index for describe_images parameters that use them. thanks James Bence
+  Make changes to a copy of the options parameter. thanks Joe Yates
+  Give 'versionId' value the expected structure. thanks Joe Yates
+  Add IAMInstanceProfile support to launch configs. thanks Jon Topper
+  Improve support for VPC Security Groups in RDS. thanks Jon Topper
+  Add IAMInstanceProfile support to launch configs. thanks Jon Topper
+  Improve support for VPC Security Groups in RDS. thanks Jon Topper
+  Remove duplication. thanks Jon Topper
+  Update S3 ACL whitelist. thanks Keith Barrette
+  Revert "[rackspace] wrapping test blocks around test helpers to prevent unexpected shindo exceptions". thanks Kyle Rames
+  merging in changes. thanks Kyle Rames
+  Added syntax highlighting for ruby code fragments. thanks Mark IJbema
+  Add request to set VM annotations in vSphere. thanks Martin Matuska
+  Add the uncommitted property to the vsphere datastore object. thanks Martin Matuska
+  changed shutdown to reboot in reboot server method. thanks Matheus Mina
+  changed __consoles to consoles and renamed consoles method to get_consoles. thanks Matheus Mina
+  fixed tests. thanks Matheus Mina
+  fixed consoles to use :aliases. thanks Matheus Mina
+  fixed AWS::Glacier::Vault.delete_notification_configuration so that it passes the ID to the underlying core request. thanks Matt Pokress
+  Allow custom Mock.not_implemented message. thanks Mike Pountney
+  Allow custom Mock.not_implemented message. thanks Mike Pountney
+  ignore .ruby-version. thanks Mike Pountney
+  vApp rename via put_vapp_name_and_description. thanks Mike Pountney
+  use std options={} format for optional parameters. thanks Mike Pountney
+  Find all and by-name Mock for Query API orgVdcNetwork. thanks Mike Pountney
+  improve network mock test data, to include vdc & IsShared. thanks Mike Pountney
+  fix tests for running against live environment. thanks Mike Pountney
+  make Mock vcloud_director_host an FQDN. thanks Mike Pountney
+  rename Mock vcloud_director_host to pass URI.parse. thanks Mike Pountney
+  Add delete_network request. thanks Mike Pountney
+  add Mock for post_create_network, use this to create/delete network in tests. thanks Mike Pountney
+  Modified AWS S3 mock, so that it errors when creating an existing bucket. thanks Nassos Antoniou
+  return NS and SOA records as per https://github.com/fog/fog/issues/2419 - this allows us to work with NS subdelegations, as well as the NS and SOA records while the type can't be changed, the values and TTLs can be. thanks Nathan Sullivan
+  Added parameter to force request timeout on xen. thanks Paulo Henrique Lopes Ribeiro
+  Adding more XenServer models. thanks Paulo Henrique Lopes Ribeiro
+  Forget to reference models on main class. thanks Paulo Henrique Lopes Ribeiro
+  adding spot price to launch configurations. thanks Rodrigo Estebanez
+  Sometimes :Environments is not a key. thanks Sarah Vessels
+  Fog::Storage::Local#directories#all: Don't break when :local_root folder is missing. thanks Sjoerd Andringa
+  Also call #load in case of missing local root folder. thanks Sjoerd Andringa
+  using new way of task mocking for edgegateway tests. thanks Sneha Somwanshi
+  updated documentation for put_vm. thanks Sneha Somwanshi
+  openstack modifications. thanks Thom Mahoney & Eugene Howe
+  openstack modifications. thanks Thom Mahoney & Eugene Howe
+  Need to list block in the argument list to access the variable. thanks Trae Robrock
+  Update describe_addresses.rb. thanks Virender Khatri
+  Update address.rb. thanks Virender Khatri
+  add gittip shield. thanks geemus
+  fix for broken AWS records tests. thanks geemus
+  expanding/rewriting the getting-help/involved section of README. thanks geemus
+  fix spacing for getting help section of README. thanks geemus
+  streamline openstack security groups tests. thanks geemus
+  move license to LICENSE.md. thanks geemus
+  add CONTRIBUTING.md. thanks geemus
+  just refer to contrib/license in readme to DRY. thanks geemus
+  Create parser for AWS assign private ip addresses. thanks joe
+  Assign private ip parser. thanks joe
+  add assign private ip request path. thanks joe
+  fix typo and add mock. thanks joe
+  Update error message on tests. thanks joe
+  private ip tests. thanks joe
+  pass options as a hash add support for multiple ips. thanks joe
+  update tests to reflect argument hash. thanks joe
+  remove debugging. thanks joe
+  fix variable name typo. thanks joe
+  remove unneeded test and destroy objects. thanks joe
+
+[openstack|compute]
+  Basic examples for Compute. thanks Daniel Lobato
+
+[openstack|storage]
+  adding missing request methods to Storage service. thanks Kyle Rames
+  updating request to use the proper file structure. thanks Kyle Rames
+
+[rackspace]
+  updating compute and storage to pull service net urls from service catalog. thanks Kyle Rames
+  wrapping test blocks around test helpers to prevent unexpected shindo exceptions. thanks Kyle Rames
+  updating test helper to log errors and not throw exceptions to prevent shindo from halting if an error occurs. thanks Kyle Rames
+  fixing more live tests. thanks Kyle Rames
+  fixing broken tests caused by bad helper. thanks Kyle Rames
+  apply documentation edits. thanks Kyle Rames
+  apply documentation edits. thanks Kyle Rames
+
+[rackspace|compute]
+  compute_v2 should require fog/rackspace. thanks Brian D. Burns
+
+[rackspace|identity]
+  re-implementing service catalog in hopes of providing a faster more flexible solution. thanks Kyle Rames
+  updated service catalog support service net. thanks Kyle Rames
+  updated service catalog to return global endpoint if specified region endpoint does not exist. thanks Kyle Rames
+  tweaking service catalog to support ruby 1.8.7. thanks Kyle Rames
+
+[rackspace|queues]
+  adding examples create queue, delete queue, and post message. thanks Kyle Rames
+  adding id alias for identity; fixed bug in message#identity that returned the id along with the claim_id query string; removed redundant code. thanks Kyle Rames
+  adding more examples. thanks Kyle Rames
+  fixing examples. thanks Kyle Rames
+  adding request YARD docs. thanks Kyle Rames
+  adding YARD docs. thanks Kyle Rames
+  adding the queues getting started guide. thanks Kyle Rames
+  updating set_messages= to populate the claim_id attribute on messages in order for destroy to work properly. thanks Kyle Rames
+  adding the queues getting started guide. thanks Kyle Rames
+
+[vSphere]
+  Implementation of feature to specify scsi_controller type at create type and also support the attribute scsi_controller to return the right class. thanks Marc Grimme
+
+[vcloud_director]
+  fix models vms_test so is pending on empty environment. thanks Dan Abel
+  tests become pending not failing on absense of testable resources. thanks Dan Abel
+  post_create_org_vdc_network. thanks Mike Pountney
+  fix to input format for post_create_org_vdc_network. thanks Mike Pountney
+  fix query test to handle delete_network. thanks Mike Pountney
+  Fix medias#create - issue #2440. thanks Nick Osborn
+  s/@end_point/end_point/. thanks Nick Osborn
+  update name, description and storage_profile for vm. thanks Sneha Somwanshi
+  ensure that MetadataEntry is a list. thanks Sneha Somwanshi
+  Show guest customization "admin password auto". thanks Stefano Tortarolo
+  Handle Guest admin password. thanks Stefano Tortarolo
+  allow nullable for gateway in network tests. thanks geemus
+
+[vclouddirector]
+  Shore up tests re EdgeGateway. thanks Mike Pountney
+  correct put_vapp_name_and_description documentation. thanks Mike Pountney
+
+[vsphere|compute]
+  restore default guest_id so setting it is optional. thanks Dominic Cleal
+  Force shutdown a server if VMware Tools is installed, but isn't running. thanks Kevin Menard
+  Pass server shutdown options through to the stop operation so the caller can force shutdown if desired. thanks Kevin Menard
+  get_vm_interface returns a hash, not an object that responds to :key. thanks Kevin Menard
+  Renamed 'vm' to 'server' to be more in line with other fog providers. thanks Kevin Menard
+  Backed out the changed to use a hash and fixed the conversion to an Interface class. thanks Kevin Menard
+  Implemented idiomatic interface destruction. thanks Kevin Menard
+  Default to a VirtualE1000 NIC if not configured. thanks Kevin Menard
+  Implemented idiomatic interface creation. thanks Kevin Menard
+  interfaces#get now properly initializes the Interface object. thanks Kevin Menard
+  Deprecated the old interface creation and destruction methods now that the idiomatic ones exist. thanks Kevin Menard
+
+[xenserver]
+  Updated models to have all attributes from version 6.2.0. thanks Paulo Henrique Lopes Ribeiro
+  Adding more XenServer Models. thanks Paulo Henrique Lopes Ribeiro
+
+
 1.18.0 10/31/2013 5442bc7e893eb73dae8bb5ee8ef0845c78c43627
 ==========================================================
 

data/fog.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog-maestrodev'
-  s.version           = '1.18.0.20131219193542'
+  s.version           = '1.19.0.20131219203941'
   s.date              = '2013-12-19'
   s.rubyforge_project = 'fog'
 

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'fog/compute/models/server'
 require 'fog/rackspace/models/compute_v2/metadata'
 
@@ -521,13 +522,14 @@ module Fog
         # @see Servers#bootstrap
         def setup(credentials = {})
           requires :public_ip_address, :identity, :public_key, :username
-          Fog::SSH.new(public_ip_address, username, credentials).run([
+          commands = [
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
-            %{passwd -l #{username}},
+            password_lock,
             %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json},
             %{echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json}
-          ])
+          ].compact
+          Fog::SSH.new(public_ip_address, username, credentials).run(commands)
         rescue Errno::ECONNREFUSED
           sleep(1)
           retry
@@ -538,6 +540,10 @@ module Fog
         def adminPass=(new_admin_pass)
           @password = new_admin_pass
         end
+
+        def password_lock
+          "passwd -l #{username}" unless attributes[:no_passwd_lock] 
+        end
       end
     end
   end

data/lib/fog/rackspace/models/compute_v2/servers.rb

@@ -29,8 +29,8 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note This method is incompatible with Cloud Servers utlizing RackConnect. RackConnect users
-        #     should use server personalization to install keys.  Please see Server#personality for more information.
+        # @note This method is compatible with Cloud Servers utlizing RackConnect ***if and only if***
+        #       provided the attribute "no_passwd_lock" set to *true*.
         # @example
         #   service.servers.bootstrap :name => 'bootstrap-server',
         #                             :flavor_id => service.flavors.first.id,

data/lib/fog/vcloud_director/requests/compute/post_create_org_vdc_network.rb

@@ -20,11 +20,11 @@ module Fog
         # @param [Hash] options
         # @option options [String] :Description Optional description.
         # @option options [Hash] :Configuration Network configuration.
-        # @option options [Hash] :EdgeGateway  EdgeGateway that connects this 
+        # @option options [Hash] :EdgeGateway  EdgeGateway that connects this
         #   Org vDC network. Applicable only for routed networks.
-        # @option options [Hash] :ServiceConfig Specifies the service 
+        # @option options [Hash] :ServiceConfig Specifies the service
         #   configuration for an isolated Org vDC networks.
-        # @option options [Boolean] :IsShared True if this network is shared 
+        # @option options [Boolean] :IsShared True if this network is shared
         #   to multiple Org vDCs.
         #   * :Configuration<~Hash>: NetworkConfigurationType
         #     * :IpScopes<~Hash>:
@@ -76,6 +76,99 @@ module Fog
             )
           end
 
+          type = 'network'
+          id = uuid
+
+          # Description
+          # Configuration
+          #   IpScopes
+          #     IpScope
+          #       IsInherited
+          #       Gateway
+          #       Netmask
+          #       Dns1
+          #       Dns2
+          #       DnsSuffix
+          #       IsEnabled
+          #       IpRanges
+          #         IpRange
+          #           StartAddress
+          #           EndAddress
+          #   FenceMode
+          # EdgeGateway
+          # IsShared
+
+          network_body = {
+            :name           => name,
+            :vdc            => vdc_id,
+          }
+
+          [:Description, :IsShared].each do |key|
+            network_body[key] = options[key] if options.key?(key)
+          end
+
+          if options.key?(:EdgeGateway)
+            network_body[:EdgeGateway] =
+              options[:EdgeGateway][:href].split('/').last
+          end
+
+          if configuration = options[:Configuration]
+            if ip_scopes = configuration[:IpScopes]
+              if ip_scope = ip_scopes[:IpScope]
+                [:IsInherited, :Gateway, :Netmask,
+                  :Dns1, :Dns2, :DnsSuffix, :IsEnabled].each do |key|
+                    network_body[key] = ip_scope[key] if ip_scope.key?(key)
+                end
+                if ip_ranges = ip_scope[:IpRanges]
+                  network_body[:IpRanges] = []
+                  ip_ranges.each do |ipr|
+                    network_body[:IpRanges] << {
+                      :StartAddress => ipr[:IpRange][:StartAddress],
+                      :EndAddress   => ipr[:IpRange][:EndAddress]
+                    }
+                  end
+                end
+              end
+            end
+            network_body[:FenceMode] = configuration[:FenceMode] if ip_scope.key?(:FenceMode)
+          end
+
+          owner = {
+            :href => make_href("#{type}/#{id}"),
+            :type => "application/vnd.vmware.vcloud.#{type}+xml"
+          }
+          task_id = enqueue_task(
+            "Adding #{type} #{name} (#{id})", 'CreateOrgVdcNetwork', owner,
+            :on_success => lambda do
+              data[:networks][id] = network_body
+            end
+          )
+
+          body = {
+            :xmlns => xmlns,
+            :xmlns_xsi => xmlns_xsi,
+            :xsi_schemaLocation => xsi_schema_location,
+            :href => make_href("admin/network/#{id}"),
+            :name => name,
+            :id => "urn:vcloud:network:#{id}",
+            :type => "application/vnd.vmware.vcloud.orgVdcNetwork+xml",
+            :Link => [
+              {:rel=>"up", :type=>"application/vnd.vmware.vcloud.vdc+xml", :href=>make_href("vdc/#{vdc_id}")},
+              {:rel=>"down", :type=>"application/vnd.vmware.vcloud.metadata+xml", :href=>make_href("admin/network/#{id}/metadata")},
+              {:rel=>"down", :type=>"application/vnd.vmware.vcloud.allocatedNetworkAddress+xml", :href=>make_href("admin/network/#{id}/allocatedAddresses/")},
+            ],
+          }.merge(options)
+
+          body[:Tasks] = {
+            :Task => task_body(task_id)
+          }
+
+          Excon::Response.new(
+            :status => 201,
+            :headers => {'Content-Type' => "#{body[:type]};version=#{api_version}"},
+            :body => body
+          )
+
         end
       end
     end

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.18.0'
+  VERSION = '1.19.0'
 end

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -195,7 +195,35 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     @instance.wait_for { ready? }
-   end
+  end
+
+  tests('#setup') do
+    perform_setup = lambda { |attributes|
+      Fog::SSH::Mock.data.clear
+
+      server = Fog::Compute::RackspaceV2::Server.new(attributes)
+
+      address = 123
+
+      server.ipv4_address = address
+      server.identity = "bar"
+      server.public_key = "baz"
+
+      server.setup
+
+      Fog::SSH::Mock.data[address].first[:commands]
+    }
+
+    test("leaves user unlocked only when requested") do
+      perform_setup.call(:service => service, :no_passwd_lock => true)
+                   .none? { |c| c =~ /passwd\s+-l\s+root/ } 
+    end
+
+    test("locks user by default") do
+      perform_setup.call(:service => service)
+                   .one? { |c| c =~ /passwd\s+-l\s+root/ }
+    end
+  end
 
   #When after testing resize/resize_confirm we get a 409 when we try to resize_revert so I am going to split it into two blocks
   model_tests(service.servers, options, true) do

data/tests/vcloud_director/requests/compute/network_tests.rb

@@ -1,3 +1,6 @@
+
+require 'pp'
+
 Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) do
 
   GET_NETWORK_FORMAT = {
@@ -20,6 +23,7 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
 
   @service = Fog::Compute::VcloudDirector.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
+  @created_net_id = nil
 
   tests('Create network in non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
     @service.post_create_org_vdc_network('00000000-0000-0000-0000-000000000000', 'bob')
@@ -29,6 +33,10 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     @service.delete_network('00000000-0000-0000-0000-000000000000')
   end
 
+  tests('Retrieve non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    @service.get_network('00000000-0000-0000-0000-000000000000')
+  end
+
   tests('#get_network').data_matches_schema(GET_NETWORK_FORMAT) do
     link = @org[:Link].detect do |l|
       l[:rel] == 'down' && l[:type] == 'application/vnd.vmware.vcloud.orgNetwork+xml'
@@ -44,23 +52,52 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     @service.get_network_metadata(@network_id).body
   end
 
-  tests('Retrieve non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
-    @service.get_network('00000000-0000-0000-0000-000000000000')
-  end
+  tests('#post_create_org_vdc_network') do
+    pending unless Fog.mocking?
+    link = @org[:Link].detect do |l|
+      l[:rel] == 'down' && l[:type] == 'application/vnd.vmware.vcloud.vdc+xml'
+    end
+
+    vdc_id = link[:href].split('/').last
+    name = VcloudDirector::Compute::Helper.test_name
 
-  # at the moment just test delete_network in Mock mode, until we have
-  # ability to create a test one in Real mode
-  if Fog.mocking?
-    # TODO replace with a Query API lookup when available
-    net_id = @service.data[:networks].keys.first
-    @delete_task = @service.delete_network(net_id).body
-    tests('#delete_network returns Task').data_matches_schema(VcloudDirector::Compute::Schema::TASK_TYPE) do
-      @delete_task
+    options = {
+      :Description => "Testing post_create_org_vdc_network #{name}",
+      :Configuration => {
+        :IpScopes => {
+          :IpScope => {
+            :IsInherited => 'false',
+            :Gateway => '198.51.100.1',
+            :Netmask => '255.255.255.0',
+            :Dns1    => '198.51.100.2',
+            :Dns2    => '198.51.100.3',
+            :DnsSuffix => 'example.com',
+            :IpRanges => [
+              { :IpRange => { :StartAddress => '198.51.100.10', :EndAddress => '198.51.100.20' } },
+              { :IpRange => { :StartAddress => '198.51.100.30', :EndAddress => '198.51.100.40' } },
+            ]
+          },
+        },
+        :FenceMode => 'isolated',
+      }
+    }
+
+    body = @service.post_create_org_vdc_network(vdc_id, name, options).body
+    @created_net_id = body[:href].split('/').last if body[:href]
+    @service.process_task(body[:Tasks][:Task]) if body && body.key?(:Tasks)
+
+    tests('fetched name matches created name').returns(name) do
+      net = @service.get_network(@created_net_id).body
+      net[:name]
     end
+  end
+
+  tests('#delete_network') do
+    pending unless Fog.mocking?
+    @delete_task = @service.delete_network(@created_net_id).body
     @service.process_task(@delete_task)
-    tests('#delete_network succeeds').returns(nil) do
-      # network missing now?
-      net_id = @service.data[:networks][net_id]
+    tests('created network has been deleted').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_network(@created_net_id)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131219193542
+  version: 1.19.0.20131219203941
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &16462360 !ruby/object:Gem::Requirement
+  requirement: &14003800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16462360
+  version_requirements: *14003800
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &16460300 !ruby/object:Gem::Requirement
+  requirement: &14001900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.31.0
   type: :runtime
   prerelease: false
-  version_requirements: *16460300
+  version_requirements: *14001900
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &16458820 !ruby/object:Gem::Requirement
+  requirement: &14000340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16458820
+  version_requirements: *14000340
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &16457500 !ruby/object:Gem::Requirement
+  requirement: &13998960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16457500
+  version_requirements: *13998960
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &16456820 !ruby/object:Gem::Requirement
+  requirement: &13998260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16456820
+  version_requirements: *13998260
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &16481540 !ruby/object:Gem::Requirement
+  requirement: &14023100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *16481540
+  version_requirements: *14023100
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &16479260 !ruby/object:Gem::Requirement
+  requirement: &14020820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *16479260
+  version_requirements: *14020820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &16477720 !ruby/object:Gem::Requirement
+  requirement: &14019080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *16477720
+  version_requirements: *14019080
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &16477160 !ruby/object:Gem::Requirement
+  requirement: &14018480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16477160
+  version_requirements: *14018480
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &16491400 !ruby/object:Gem::Requirement
+  requirement: &14032640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16491400
+  version_requirements: *14032640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16489860 !ruby/object:Gem::Requirement
+  requirement: &14031080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16489860
+  version_requirements: *14031080
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &16487960 !ruby/object:Gem::Requirement
+  requirement: &14029280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16487960
+  version_requirements: *14029280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16487360 !ruby/object:Gem::Requirement
+  requirement: &14028660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16487360
+  version_requirements: *14028660
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &16486660 !ruby/object:Gem::Requirement
+  requirement: &14028000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16486660
+  version_requirements: *14028000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16484620 !ruby/object:Gem::Requirement
+  requirement: &14025840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *16484620
+  version_requirements: *14025840
 - !ruby/object:Gem::Dependency
   name: rbovirt
-  requirement: &16495180 !ruby/object:Gem::Requirement
+  requirement: &14036320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.0.11
   type: :development
   prerelease: false
-  version_requirements: *16495180
+  version_requirements: *14036320
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &16493780 !ruby/object:Gem::Requirement
+  requirement: &14035080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *16493780
+  version_requirements: *14035080
 - !ruby/object:Gem::Dependency
   name: fission
-  requirement: &16492320 !ruby/object:Gem::Requirement
+  requirement: &14033660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16492320
+  version_requirements: *14033660
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &16522940 !ruby/object:Gem::Requirement
+  requirement: &14064100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16522940
+  version_requirements: *14064100
 - !ruby/object:Gem::Dependency
   name: google-api-client
-  requirement: &16522040 !ruby/object:Gem::Requirement
+  requirement: &14063200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *16522040
+  version_requirements: *14063200
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &16521300 !ruby/object:Gem::Requirement
+  requirement: &14062480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16521300
+  version_requirements: *14062480
 description: The Ruby cloud services library. Supports all major cloud providers including
   AWS, Rackspace, Linode, Blue Box, StormOnDemand, and many others. Full support for
   most AWS services including EC2, S3, CloudWatch, SimpleDB, ELB, and RDS.
@@ -5414,7 +5414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1401150800215848202
+      hash: 3066775075540008135
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: