fog-maestrodev 1.18.0.20131209091424 → 1.18.0.20131218202447

data/lib/fog/xenserver/models/compute/storage_repository.rb

@@ -6,15 +6,18 @@ module Fog
 
       class StorageRepository < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=SR
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=SR
 
         identity :reference
 
         attribute :name,                 :aliases => :name_label
         attribute :description,          :aliases => :name_description
         attribute :uuid
+        attribute :blobs
         attribute :allowed_operations
         attribute :current_operations
+        attribute :introduced_by
+        attribute :local_cache_enabled
         attribute :content_type
         attribute :other_config
         attribute :__pbds,               :aliases => :PBDs

data/lib/fog/xenserver/models/compute/tunnel.rb

@@ -0,0 +1,20 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Tunnel < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=tunnel
+
+        identity :reference
+
+        attribute :access_pif,          :aliases => :access_PIF
+        attribute :other_config
+        attribute :status
+        attribute :transport_pif,       :aliases => :transport_PIF
+        attribute :uuid
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/tunnels.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/tunnel'
+
+module Fog
+  module Compute
+    class XenServer
+      class Tunnels < Fog::Collection
+        model Fog::Compute::XenServer::Tunnel
+
+        def all(options={})
+          data = service.get_records 'tunnel'
+          load(data)
+        end
+
+        def get( tunnel_ref )
+          if tunnel_ref && tunnel = service.get_record( tunnel_ref, 'tunnel' )
+            new(tunnel)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/vbd.rb

@@ -6,7 +6,7 @@ module Fog
 
       class VBD < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VBD
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VBD
 
         identity :reference
 
@@ -22,8 +22,8 @@ module Fog
         attribute :type
         attribute :userdevice
         attribute :empty
-        attribute :type
         attribute :mode
+        attribute :other_config
         attribute :storage_lock
         attribute :runtime_properties
         attribute :unpluggable
@@ -31,6 +31,7 @@ module Fog
         attribute :qos_supported_algorithms
         attribute :qos_algorithm_params
         attribute :qos_algorithm_type
+        attribute :qos_supported_algorithms
         attribute :empty
         attribute :__metrics,           :aliases => :metrics
 

data/lib/fog/xenserver/models/compute/vbd_metrics.rb

@@ -6,7 +6,7 @@ module Fog
     
       class VbdMetrics < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VBD_metrics
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VBD_metrics
         
         identity :reference
         

data/lib/fog/xenserver/models/compute/vdi.rb

@@ -6,7 +6,7 @@ module Fog
 
       class VDI < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VDI
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VDI
 
         identity :reference
 
@@ -22,6 +22,7 @@ module Fog
         attribute :read_only
         attribute :current_operations
         attribute :allowed_operations
+        attribute :__crash_dumps,               :aliases => :crash_dumps
         attribute :type
         attribute :other_config
         attribute :tags
@@ -30,6 +31,8 @@ module Fog
         attribute :missing
         attribute :location
         attribute :managed
+        attribute :metadata_latest
+        attribute :metadata_of_pool
         attribute :allow_caching
         attribute :on_boot
         attribute :sm_config

data/lib/fog/xenserver/models/compute/vif.rb

@@ -6,17 +6,26 @@ module Fog
 
       class VIF < Fog::Model
         # API Reference here:
-        # http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VIF
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VIF
 
         identity :reference
 
         attribute :mac,                :aliases => :MAC
         attribute :uuid
         attribute :allowed_operations
+        attribute :current_operations
         attribute :currently_attached
         attribute :device
+        attribute :ipv4_allowed
+        attribute :ipv6_allowed
+        attribute :locking_mode
         attribute :mac_autogenerated,  :aliases => :MAC_autogenerated
-        attribute :metrics
+        attribute :__metrics,          :aliases => :metrics
+        attribute :other_config
+        attribute :qos_algorithm_params
+        attribute :qos_algorithm_type
+        attribute :qos_supported_algorithms
+        attribute :runtime_properties
         attribute :mtu,                :aliases => :MTU
         attribute :__network,          :aliases => :network
         attribute :status_code

data/lib/fog/xenserver/models/compute/vlan.rb

@@ -6,12 +6,13 @@ module Fog
 
       class VLAN < Fog::Model
         # API Reference here:
-        # @see http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VLAN
+        # @see http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VLAN
 
         identity :reference
 
         attribute :uuid
         attribute :tag,                :type => :integer
+        attribute :other_config
         attribute :__untagged_pif,     :aliases => :untagged_PIF
         attribute :__tagged_pif,       :aliases => :tagged_PIF
 

data/lib/fog/xenserver/models/compute/vmpp.rb

@@ -0,0 +1,35 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vmpp < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VMPP
+
+        identity :reference
+
+        attribute :alarm_config
+        attribute :archive_frequency
+        attribute :archive_last_run_time
+        attribute :archive_schedule
+        attribute :archive_target_config
+        attribute :archive_target_type
+        attribute :backup_frequency
+        attribute :backup_last_run_time
+        attribute :backup_retention_value
+        attribute :backup_schedule
+        attribute :backup_type
+        attribute :is_alarm_enabled
+        attribute :is_archive_running
+        attribute :is_backup_running
+        attribute :is_policy_enabled
+        attribute :description,         :aliases => :name_description
+        attribute :name,                :aliases => :name_label
+        attribute :recent_alerts
+        attribute :uuid
+        attribute :__vms,               :aliases => :VMs
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/vmpps.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/vmpp'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vmpps < Fog::Collection
+        model Fog::Compute::XenServer::Vmpp
+
+        def all(options={})
+          data = service.get_records 'VMPP'
+          load(data)
+        end
+
+        def get( vmpp_ref )
+          if vmpp_ref && vmpp = service.get_record( vmpp_ref, 'VMPP' )
+            new(vmpp)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/vtpm.rb

@@ -0,0 +1,18 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vtpm < Fog::Model
+        # API Reference here:
+        # http://docs.vmd.citrix.com/XenServer/6.2.0/1.0/en_gb/api/?c=VTPM
+
+        identity :reference
+
+        attribute :__backend,       :aliases => :backend
+        attribute :uuid
+        attribute :__vm,            :aliases => :vm
+      end
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/vtpms.rb

@@ -0,0 +1,25 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/vtpm'
+
+module Fog
+  module Compute
+    class XenServer
+      class Vtpms < Fog::Collection
+        model Fog::Compute::XenServer::Vtpm
+
+        def all(options={})
+          data = service.get_records 'VTPM'
+          load(data)
+        end
+
+        def get( vtpm_ref )
+          if vtpm_ref && vtpm = service.get_record( vtpm_ref, 'VTPM' )
+            new(vtpm)
+          else
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/tests/aws/requests/compute/assign_private_ip_tests.rb

@@ -0,0 +1,52 @@
+Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
+
+  tests('success') do
+
+    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @vpc_id = @vpc.id
+
+    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
+    @subnet_id = @subnet.subnet_id
+
+    @network_interface = Fog::Compute[:aws].network_interfaces.new(:subnet_id => @subnet_id)
+    @network_interface.save
+    @network_interface_id =  @network_interface.network_interface_id
+
+    @ip_address = Fog::AWS::Mock.ip_address
+    @second_ip_address = Fog::AWS::Mock.ip_address
+
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}']})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address]}).body
+    end
+
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'SecondaryPrivateIpAddressCount'=>4})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, {'SecondaryPrivateIpAddressCount'=>4}).body
+    end
+
+    @network_interface.destroy
+    @subnet.destroy
+    @vpc.destroy
+  end
+
+  tests('failure') do
+    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @vpc_id = @vpc.id
+
+    @subnet=Fog::Compute[:aws].subnets.create('vpc_id' => @vpc_id, 'cidr_block' => '10.0.10.0/24')
+    @subnet_id = @subnet.subnet_id
+
+    @network_interface = Fog::Compute[:aws].network_interfaces.new(:subnet_id => @subnet_id)
+    @network_interface.save
+    @network_interface_id =  @network_interface.network_interface_id
+
+    @ip_address = Fog::AWS::Mock.ip_address
+
+    tests("#assign_private_ip_addresses('#{@network_interface_id}', {'PrivateIpAddresses'=>['#{@ip_address}','#{@second_ip_address}'], 'SecondaryPrivateIpAddressCount'=>4 })").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].assign_private_ip_addresses(@network_interface_id, { 'PrivateIpAddresses' =>[@ip_address, @second_ip_address], 'SecondaryPrivateIpAddressCount'=>4 }).body
+    end
+
+    @network_interface.destroy
+    @subnet.destroy
+    @vpc.destroy
+  end
+end

data/tests/google/models/compute/servers_tests.rb

@@ -1,5 +1,16 @@
 Shindo.tests("Fog::Compute[:google] | servers", ['google']) do
 
-  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+  @google = Fog::Compute[:google]
+
+  @zone = 'us-central1-a'
+  @disk = @google.disks.create({
+    :name => "fogservername",
+    :size_gb => "2",
+    :zone_name => @zone,
+    :source_image => "debian-7-wheezy-v20131120",
+  })
+  @disk.wait_for { ready? }
+
+  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
 
 end

data/tests/google/requests/compute/image_tests.rb

@@ -24,7 +24,6 @@ Shindo.tests('Fog::Compute[:google] | image requests', ['google']) do
       'name' => String,
       'description' => String,
       'sourceType' => String,
-      'preferredKernel' => String,
       'rawDisk' => {
         'containerType' => String,
         'source' => String

data/tests/helpers/mock_helper.rb

@@ -82,7 +82,7 @@ if Fog.mock?
     :vcloud_host                      => 'vcloud_host',
     :vcloud_password                  => 'vcloud_password',
     :vcloud_username                  => 'vcloud_username',
-    :vcloud_director_host             => 'vcloud_director_host',
+    :vcloud_director_host             => 'vcloud-director-host',
     :vcloud_director_password         => 'vcloud_director_password',
     :vcloud_director_username         => 'vcd_user@vcd_org_name',
     :voxel_api_key                    => 'voxel_api_key',

data/tests/openstack/models/compute/security_group_tests.rb

@@ -0,0 +1,54 @@
+Shindo.tests("Fog::Compute[:openstack] | security_group", ['openstack']) do
+  tests('success') do
+    begin
+      fog = Fog::Compute[:openstack]
+
+      security_group = fog.security_groups.create(
+        :name        => 'my_group',
+        :description => 'my group'
+      )
+
+      tests('#create').succeeds do
+        security_group = fog.security_groups.create(
+          :name        => 'my_group',
+          :description => 'my group'
+        )
+
+        returns('my_group') { security_group.name }
+        returns('my group') { security_group.description }
+        returns([])         { security_group.security_group_rules }
+        returns(true)       { security_group.tenant_id != nil }
+      end
+
+      tests('#rules').succeeds do
+        tests("#create").succeeds do
+          rules_count = security_group.security_group_rules.count
+          rule        = security_group.security_group_rules.create(
+            :parent_group_id => security_group.id,
+            :ip_protocol     => 'tcp',
+            :from_port       => 1234,
+            :to_port         => 1234,
+            :ip_range        => { "cidr" => "0.0.0.0/0" }
+          )
+          returns(true) { security_group.security_group_rules.count == (rules_count + 1) }
+          security_group_rule = security_group.security_group_rules.detect { |r| r.id == rule.id }
+          returns(true) { security_group_rule.attributes == rule.attributes }
+        end
+
+        tests("#destroy").succeeds do
+          rule        = security_group.security_group_rules.create(
+            :parent_group_id => security_group.id,
+            :ip_protocol     => 'tcp',
+            :from_port       => 1234,
+            :to_port         => 1234,
+            :ip_range        => { "cidr" => "0.0.0.0/0" }
+          )
+          rule.destroy
+          returns(true) { rule.reload == nil }
+        end
+      end
+    ensure
+      security_group.destroy if security_group
+    end
+  end
+end

data/tests/openstack/requests/compute/security_group_tests.rb

@@ -10,23 +10,26 @@ Shindo.tests('Fog::Compute[:openstack] | security group requests', ['openstack']
   }
 
   @security_group_rule_format = {
-    "id"          => Integer,
-    "from_port"   => Integer,
-    "to_port"     => Integer,
-    "ip_protocol" => String,
-    "group"       => Hash,
-    "ip_range"    => Hash,
+    "id"              => Integer,
+    "from_port"       => Integer,
+    "to_port"         => Integer,
+    "ip_protocol"     => String,
+    "group"           => Hash,
+    "ip_range"        => Hash,
     "parent_group_id" => Integer
   }
 
   tests('success') do
     tests('#create_security_group(name, description)').formats({"security_group" => @security_group_format}) do
-      Fog::Compute[:openstack].create_security_group('from_shindo_test', 'this is from the shindo test').body
+      security_group = Fog::Compute[:openstack].create_security_group('from_shindo_test', 'this is from the shindo test').body
+      @security_group_id = security_group['security_group']['id']
+      security_group
     end
 
     tests('#create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id=nil)').formats({"security_group_rule" => @security_group_rule_format}) do
-      parent_group_id = Fog::Compute[:openstack].list_security_groups.body['security_groups'].last['id']
-      Fog::Compute[:openstack].create_security_group_rule(parent_group_id, "tcp", 2222, 3333, "20.20.20.20/24").body
+      security_group_rule = Fog::Compute[:openstack].create_security_group_rule(@security_group_id, "tcp", 2222, 3333, "20.20.20.20/24").body
+      @security_group_rule_id = security_group_rule['security_group_rule']['id']
+      security_group_rule
     end
 
     tests('#list_security_groups').formats({"security_groups" => [@security_group_format]}) do
@@ -34,25 +37,24 @@ Shindo.tests('Fog::Compute[:openstack] | security group requests', ['openstack']
     end
 
     tests('#get_security_group(security_group_id)').formats({"security_group" => @security_group_format}) do
-      group_id = Fog::Compute[:openstack].list_security_groups.body['security_groups'].last['id']
-      Fog::Compute[:openstack].get_security_group(group_id).body
+      Fog::Compute[:openstack].get_security_group(@security_group_id).body
+    end
+
+    tests('#get_security_group_rule').formats({"security_group_rule" => @security_group_rule_format}) do
+      Fog::Compute[:openstack].create_security_group_rule(@security_group_id, "tcp", 2222, 3333, "20.20.20.20/24").body
+      Fog::Compute[:openstack].get_security_group_rule(@security_group_rule_id).body
     end
 
     tests('#delete_security_group_rule(security_group_rule_id)').succeeds do
-      security_group_rule_id = Fog::Compute[:openstack].list_security_groups.body['security_groups'].last['rules'].last['id']
-      Fog::Compute[:openstack].delete_security_group_rule(security_group_rule_id)
+      Fog::Compute[:openstack].delete_security_group_rule(@security_group_rule_id)
     end
 
     tests('#delete_security_group(security_group_id)').succeeds do
-      compute = Fog::Compute[:openstack]
-
-      group_id = compute.list_security_groups.body['security_groups'].last['id']
-
-      compute.delete_security_group(group_id)
+      Fog::Compute[:openstack].delete_security_group(@security_group_id)
 
       returns(false) {
-        groups = compute.list_security_groups.body['security_groups']
-        groups.any? { |group| group['id'] == group_id }
+        groups = Fog::Compute[:openstack].list_security_groups.body['security_groups']
+        groups.any? { |group| group['id'] == @security_group_id }
       }
     end
   end # tests('success')

data/tests/openstack/requests/network/network_tests.rb

@@ -1,13 +1,13 @@
 Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
 
   @network_format = {
-    'id'                        => String,
-    'name'                      => String,
-    'subnets'                   => Array,
-    'shared'                    => Fog::Boolean,
-    'status'                    => String,
-    'admin_state_up'            => Fog::Boolean,
-    'tenant_id'                 => String
+    'id'              => String,
+    'name'            => String,
+    'subnets'         => Array,
+    'shared'          => Fog::Boolean,
+    'status'          => String,
+    'admin_state_up'  => Fog::Boolean,
+    'tenant_id'       => String,
   }
 
   @network_format_extensions = {
@@ -98,7 +98,7 @@ Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
       Fog::Network[:openstack].delete_network(0)
     end
   end
-      
+
   # Cleaning up the mess
   Fog::Network[:openstack].networks.each do |n|
     Fog::Network[:openstack].delete_network(n.id)

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

@@ -34,11 +34,17 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
   @service = Fog::Compute::VcloudDirector.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
-  tests('Get first vDC') do
-    link = @org[:Link].detect do |l|
-      l[:type] == 'application/vnd.vmware.vcloud.vdc+xml'
+  tests('Get first vDC with an EdgeGatewayRecord') do
+    @org[:Link].each do |l|
+      if l[:type] == 'application/vnd.vmware.vcloud.vdc+xml'
+        id = l[:href].split('/').last
+        edge_gateways = @service.get_org_vdc_gateways(id).body
+        if edge_gateways && edge_gateways[:EdgeGatewayRecord].size >= 1 
+          @vdc_id = id
+          break
+        end
+      end
     end
-    @vdc_id = link[:href].split('/').last
   end
 
   tests('#get_org_vdc_gateways').data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_RECORDS_TYPE) do
@@ -52,17 +58,20 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
 
   @edge_gateways[:EdgeGatewayRecord].each do |result|
     tests("each EdgeGatewayRecord").
-      data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_EDGE_GATEWAY_RECORD_TYPE) { result }
+      data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_EDGE_GATEWAY_RECORD_TYPE) do
+        result
+      end
   end
 
   tests('#get_edge_gateway').data_matches_schema(VcloudDirector::Compute::Schema::GATEWAY_TYPE) do
     @edge_gateway_id = @edge_gateways[:EdgeGatewayRecord].first[:href].split('/').last
-    @orginal_gateway_conf = @service.get_edge_gateway(@edge_gateway_id).body
+    @original_gateway_conf = @service.get_edge_gateway(@edge_gateway_id).body
   end
 
+
   tests('#configure_edge_gateway_services') do
 
-    rule = @orginal_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID }
+    rule = @original_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID }
     raise('fail fast if our test firewall rule already exists - its likely left over from a broken test run') if rule
 
     response = @service.post_configure_edge_gateway_services(@edge_gateway_id, @new_edge_gateway_configuration)
@@ -75,7 +84,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
 
     tests('#remove the firewall rule added by test').returns(nil) do
       response = @service.post_configure_edge_gateway_services(@edge_gateway_id,
-                                                               @orginal_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration])
+                                                               @original_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration])
       @service.process_task(response.body)
       edge_gateway = @service.get_edge_gateway(@edge_gateway_id).body
       edge_gateway[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID }

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

@@ -7,7 +7,7 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     :id => String,
     :description => Fog::Nullable::String,
     :is_inherited => Fog::Boolean,
-    :gateway => String,
+    :gateway => Fog::Nullable::String,
     :netmask => String,
     :dns1 => Fog::Nullable::String,
     :dns2 => Fog::Nullable::String,
@@ -21,6 +21,14 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
   @service = Fog::Compute::VcloudDirector.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
+  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')
+  end
+
+  tests('Delete non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    @service.delete_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'
@@ -40,4 +48,20 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     @service.get_network('00000000-0000-0000-0000-000000000000')
   end
 
+  # 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
+    end
+    @service.process_task(@delete_task)
+    tests('#delete_network succeeds').returns(nil) do
+      # network missing now?
+      net_id = @service.data[:networks][net_id]
+    end
+  end
+
 end