fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/vsphere/requests/compute/list_server_types.rb

@@ -0,0 +1,55 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def list_server_types(filters={})
+          datacenter_name = filters[:datacenter]
+          servertypes=raw_server_types(datacenter_name)
+          if servertypes
+            servertypes.map do | servertype |
+               server_type_attributes(servertype, datacenter_name) 
+            end.compact
+          else
+            nil
+          end
+          #select{ | guestdesc | guestdesc.select{ | k, v | filter.has_key?(k) and filter[k] == v }==filter }
+        end
+      
+        def raw_server_types(datacenter_name, filter={})
+          datacenter=find_raw_datacenter(datacenter_name)
+          environmentBrowser=datacenter.hostFolder.childEntity.grep(RbVmomi::VIM::ComputeResource).first.environmentBrowser
+          if environmentBrowser
+            environmentBrowser.QueryConfigOption[:guestOSDescriptor]
+          end
+        end
+        
+        protected
+        
+        def server_type_attributes(servertype, datacenter)
+          {
+            :id         => servertype.id,
+            :name       => servertype.id,
+            :family     => servertype.family,
+            :fullname   => servertype.fullName,
+            :datacenter => datacenter,
+          }          
+        end
+      end
+      class Mock
+        def list_server_types(datacenter_name)
+          [{:id=>"rhel6Guest", 
+            :name=>"rhel6Guest", 
+            :family=>"linuxGuest", 
+            :fullname=>"Red Hat Enterprise Linux 6 (32-Bit)", 
+            :datacenter=>"Solutions"}, 
+           {:id=>"rhel5_64Guest", 
+            :name=>"rhel5_64Guest", 
+            :family=>"linuxGuest", 
+            :fullname=>"Red Hat Enterprise Linux 5 (64-Bit)", 
+            :datacenter=>"Solutions"}]
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/list_vm_volumes.rb

@@ -36,7 +36,9 @@ module Fog
               :filename => vol.backing.fileName,
               :datastore => (vol.backing.datastore.name rescue(nil)),
               :size => vol.capacityInKB,
-              :name => vol.deviceInfo.label
+              :name => vol.deviceInfo.label,
+              :key => vol.key,
+              :unit_number => vol.unitNumber
             }
           end
         end

data/lib/fog/vsphere/requests/compute/modify_vm_interface.rb

@@ -6,33 +6,36 @@ module Fog
         def add_vm_interface(vmid, options = {})
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
-          interface=get_interface_from_options(vmid, options)
+          interface = get_interface_from_options(vmid, options.merge(:server_id => vmid))
           vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface)]})
         end
 
         def destroy_vm_interface(vmid, options = {})
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
-          interface=get_vm_interface(vmid, options)
+          interface = get_interface_from_options(vmid, options.merge(:server_id => vmid))
           vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface, interface.key, :remove)]})
         end
         
         def update_vm_interface(vmid, options = {})
           raise ArgumentError, "instance id is a required parameter" unless vmid
 
-          interface=get_vm_interface(vmid, options)
-          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface, interface.key, :edit)]})          
+          interface = get_interface_from_options(vmid, options.merge(:server_id => vmid))
+          vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[create_interface(interface, interface.key, :edit)]})
         end
 
         private
         def get_interface_from_options(vmid, options)
           if options and options[:interface]
             options[:interface]
+
           elsif options[:key] and options[:key]>0
-            oldattributes=get_vm_interface(vmid, options)
-            Fog::Compute::Vsphere::Interface.new oldattributes.merge options
+            oldattributes = get_vm_interface(vmid, options)
+            Fog::Compute::Vsphere::Interface.new(oldattributes.merge(options))
+
           elsif options[:type] and options[:network]
             Fog::Compute::Vsphere::Interface.new options
+
           else
             raise ArgumentError, "interface is a required parameter or pass options with type and network"
           end

data/lib/fog/vsphere/requests/compute/modify_vm_volume.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+
+        def add_vm_volume(volume)
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :add)]})
+        end
+
+        def destroy_vm_volume(volume)
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :remove)]})
+        end
+      end
+
+      class Mock
+        def add_vm_volume(volume)
+          true
+        end
+
+        def destroy_vm_volume(volume)
+          true
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -141,6 +141,8 @@ module Fog
           # Options['numCPUs'] or Options['memoryMB']
           # Build up the specification for Hardware, for more details see ____________
           # https://github.com/rlane/rbvmomi/blob/master/test/test_serialization.rb
+          # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
+          # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
           virtual_machine_config_spec.numCPUs = options['numCPUs'] if  ( options.has_key?('numCPUs') )
           virtual_machine_config_spec.memoryMB = options['memoryMB'] if ( options.has_key?('memoryMB') )
           # Options['customization_spec']
@@ -189,15 +191,6 @@ module Fog
           end
           customization_spec ||= nil
 
-          # FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
-          # http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
-          if options.has_key?('memoryMB') || options.has_key?('numCPUs')
-            virtual_machine_config_spec = {
-              :memoryMB => options['memoryMB'],
-              :numCPUs  => options['numCPUs']
-            }
-          end
-
           relocation_spec=nil
           if ( options['linked_clone'] )
             # cribbed heavily from the rbvmomi clone_vm.rb

data/lib/fog/vsphere/requests/compute/vm_reconfig_cpus.rb

@@ -5,7 +5,7 @@ module Fog
         def vm_reconfig_cpus(options = {})
           raise ArgumentError, "cpus is a required parameter" unless options.has_key? 'cpus'
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
-          hardware_spec={'numCPUs' => options['cpus']}
+          hardware_spec={'numCPUs' => options['cpus'], 'numCoresPerSocket' => options['corespersocket']}
           vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
         end
       end
@@ -14,7 +14,7 @@ module Fog
         def vm_reconfig_cpus(options = {})
           raise ArgumentError, "cpus is a required parameter" unless options.has_key? 'cpus'
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
-          hardware_spec={'numCPUs' => options['cpus']}
+          hardware_spec={'numCPUs' => options['cpus'], 'numCoresPerSocket' => options['corespersocket']}
           vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
         end
       end

data/lib/fog/xenserver/requests/compute/create_server.rb

@@ -31,7 +31,7 @@ module Fog
               PV_kernel
               PV_ramdisk
               PV_legacy_args
-              HVM_boot_params
+              HVM_boot_policy
               HVM_boot_params
           }.each do |k|
             if config[k.downcase.to_sym]

data/lib/tasks/changelog_task.rb

@@ -55,6 +55,7 @@ module Fog
             if [
               'Aaron Suggs',
               'Brian Hartsock',
+              'Chris Roberts',
               'Christopher Oliver',
               'Daniel Reichert',
               'Decklin Foster',
@@ -68,11 +69,13 @@ module Fog
               'Lincoln Stoll',
               'Luqman Amjad',
               'Michael Zeng',
+              'Mike Hagedorn',
               'Nat Welch',
               'Nick Osborn',
               'nightshade427',
               'Patrick Debois',
               'Paul Thornthwaite',
+              'Rodrigo Estebanez',
               'Rupak Ganguly',
               'Stepan G. Fedorov',
               'Wesley Beary'

data/lib/tasks/test_task.rb

@@ -26,6 +26,7 @@ module Fog
         threads = []
         Thread.main[:results] = []
         Fog.providers.each do |key, value|
+          next if key == :hp
           threads << Thread.new do
             Thread.main[:results] << {
               :provider => value,

data/tests/aws/models/compute/server_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
 
   @instance = Fog::Compute[:aws].servers.new
 
-  [:addresses, :flavor, :key_pair, :key_pair=, :volumes].each do |association|
+  [:addresses, :flavor, :key_pair, :key_pair=, :volumes, :associate_public_ip].each do |association|
     responds_to(association)
   end
 
@@ -18,6 +18,16 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
       @instance.attributes[:monitoring] == false
     end
 
+    test('#associate_public_ip = true') do
+      @instance.associate_public_ip = true
+      @instance.attributes[:associate_public_ip] == true
+    end
+
+    test('#associate_public_ip = false') do
+      @instance.associate_public_ip = false
+      @instance.associate_public_ip == false
+    end    
+
   end
 
   tests('existing instance') do
@@ -40,6 +50,16 @@ Shindo.tests("Fog::Compute[:aws] | monitor", ['aws']) do
       @instance.monitoring == false
     end
 
+    test('#associate_public_ip = true') do
+      @instance.associate_public_ip = true
+      @instance.attributes[:associate_public_ip] == true
+    end
+
+    test('#associate_public_ip = false') do
+      @instance.associate_public_ip = false
+      @instance.associate_public_ip == false
+    end
+
   end
 
   @instance.destroy

data/tests/aws/models/elb/model_tests.rb

@@ -193,6 +193,12 @@ Shindo.tests('AWS::ELB | models', ['aws', 'elb']) do
       returns(@availability_zones) { elb.availability_zones.sort }
     end
 
+    tests('cross_zone_load_balancing') do
+      returns(false) {elb.cross_zone_load_balancing?}
+      elb.cross_zone_load_balancing = true
+      returns(true) {elb.cross_zone_load_balancing?}
+    end
+
     tests('default health check') do
       default_health_check = {
         "HealthyThreshold"=>10,

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

@@ -3,6 +3,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
   @instance_format = {
     'architecture'        => String,
     'amiLaunchIndex'      => Integer,
+    'associatePublicIP'   => Fog::Nullable::Boolean,    
     'attachmentId'        => Fog::Nullable::String,
     'blockDeviceMapping'  => [Fog::Nullable::Hash],
     'clientToken'         => Fog::Nullable::String,
@@ -115,6 +116,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       'instanceType'        => String,
       'availabilityZone'    => String,
       'start'               => Time,
+      'end'                 => Time,
       'duration'            => Integer,
       'fixedPrice'          => Float,
       'usagePrice'          => Float,

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

@@ -26,6 +26,11 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
     tests('#describe_internet_gateways').formats(@internet_gateways_format) do
       Fog::Compute[:aws].describe_internet_gateways.body
     end
+    
+    tests('#describe_internet_gateways with tags').formats(@internet_gateways_format) do
+      Fog::Compute[:aws].create_tags @igw_id, {"environment" => "production"}
+      Fog::Compute[:aws].describe_internet_gateways.body
+    end
 
     tests("#attach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].attach_internet_gateway(@igw_id, @vpc_id).body

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

@@ -161,6 +161,23 @@ Shindo.tests('Fog::Compute[:aws] | network interface requests', ['aws']) do
      Fog::Compute[:aws].delete_network_interface(@nic_id).body
     end
 
+    @server.destroy
+    if !Fog.mocking?
+      @server.wait_for { state == 'terminated' }
+      # despite the fact that the state goes to 'terminated' we need a little delay for aws to do its thing
+    sleep 5
+    end
+
+    # Bring up another server to test vpc public IP association
+    @server = Fog::Compute[:aws].servers.create(:flavor_id => 'm1.small', :subnet_id => @subnet_id, :associate_public_ip => true)
+    @server.wait_for { ready? }
+    @instance_id = @server.id
+
+    test("#associate_public_ip") do
+      server = Fog::Compute[:aws].servers.get(@instance_id)
+      server.public_ip_address.nil? == false
+    end
+
     # Clean up resources
     @server.destroy
     if !Fog.mocking?

data/tests/aws/requests/elb/load_balancer_tests.rb

@@ -36,6 +36,12 @@ Shindo.tests('AWS::ELB | load_balancer_tests', ['aws', 'elb']) do
       end
     end
 
+    tests("modify_load_balancer_attributes") do
+      Fog::AWS[:elb].modify_load_balancer_attributes(@load_balancer_id, 'CrossZoneLoadBalancing' => {'Enabled' => true}).body
+      response = Fog::AWS[:elb].describe_load_balancer_attributes(@load_balancer_id).body
+      response['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing']['Enabled'] == true
+    end
+
     tests("#configure_health_check").formats(AWS::ELB::Formats::CONFIGURE_HEALTH_CHECK) do
       health_check = {
         'Target' => 'HTTP:80/index.html',

data/tests/aws/requests/iam/group_policy_tests.rb

@@ -1,15 +1,12 @@
 Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].create_group('fog_group_policy_tests')
-  end
+  Fog::AWS[:iam].create_group('fog_group_policy_tests')
 
   tests('success') do
 
     @policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
 
     tests("#put_group_policy('fog_group_policy_tests', 'fog_policy', #{@policy.inspect})").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].put_group_policy('fog_group_policy_tests', 'fog_policy', @policy).body
     end
 
@@ -24,11 +21,20 @@ Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
       Fog::AWS[:iam].list_group_policies('fog_group_policy_tests').body
     end
 
+    @group_policy_format = {
+      'GroupName' => String,
+      'PolicyName' => String,
+      'PolicyDocument' => Hash,
+    }
+
+    tests("#get_group_policy('fog_group_policy_tests', 'fog_policy'").formats(@group_policy_format) do
+      Fog::AWS[:iam].get_group_policy('fog_policy', 'fog_group_policy_tests').body['Policy']
+    end
+
     tests("#delete_group_policy('fog_group_policy_tests', 'fog_policy')").formats(AWS::IAM::Formats::BASIC) do
       pending if Fog.mocking?
       Fog::AWS[:iam].delete_group_policy('fog_group_policy_tests', 'fog_policy').body
     end
-
   end
 
   tests('failure') do
@@ -39,4 +45,4 @@ Shindo.tests('AWS::IAM | group policy requests', ['aws']) do
     Fog::AWS[:iam].delete_group('fog_group_policy_tests')
   end
 
-end
+end

data/tests/aws/requests/storage/bucket_tests.rb

@@ -24,14 +24,14 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
     }
     @bucket_lifecycle_format = {
       'Rules' => [{
-         'ID'         => String, 
+         'ID'         => String,
          'Prefix'     => Fog::Nullable::String,
-         'Enabled'    => Fog::Boolean, 
+         'Enabled'    => Fog::Boolean,
          'Expiration' => Fog::Nullable::Hash,
          'Transition' => Fog::Nullable::Hash
        }]
     }
-      
+
     @service_format = {
       'Buckets' => [{
         'CreationDate'  => Time,
@@ -275,6 +275,22 @@ Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
       Fog::Storage[:aws].put_bucket_cors(@aws_bucket_name, cors)
     end
 
+    tests("bucket tagging") do
+
+      tests("#put_bucket_tagging('#{@aws_bucket_name}')").succeeds do
+        Fog::Storage[:aws].put_bucket_tagging(@aws_bucket_name, {'Key1' => 'Value1', 'Key2' => 'Value2'})
+      end
+
+      tests("#get_bucket_tagging('#{@aws_bucket_name}')").
+        returns('BucketTagging' => {'Key1' => 'Value1', 'Key2' => 'Value2'}) do
+        Fog::Storage[:aws].get_bucket_tagging(@aws_bucket_name).body
+      end
+
+      tests("#delete_bucket_tagging('#{@aws_bucket_name}')").succeeds do
+        Fog::Storage[:aws].delete_bucket_tagging(@aws_bucket_name)
+      end
+    end
+
     tests("#delete_bucket('#{@aws_bucket_name}')").succeeds do
       Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
     end

data/tests/aws/requests/storage/object_tests.rb

@@ -47,6 +47,7 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do
     end
 
     tests("#post_object_restore('#{@directory.identity}', 'fog_object')").succeeds do
+      pending unless Fog.mocking?
       Fog::Storage[:aws].post_object_restore(@directory.identity, 'fog_object')
     end
 

data/tests/aws/signed_params_tests.rb

@@ -1,11 +1,7 @@
 # encoding: utf-8
 
 Shindo.tests('AWS | signed_params', ['aws']) do
-  returns( Fog::AWS.escape( "'Stöp!' said Fred_-~." ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~." }
-
-  tests('Keys can contain a hierarchical prefix which should not be escaped') do
-    returns( Fog::AWS.escape( "key/with/prefix" ) ) { "key/with/prefix" }
-  end
+  returns( Fog::AWS.escape( "'Stöp!' said Fred_-~./" ) ) { "%27St%C3%B6p%21%27%20said%20Fred_-~.%2F" }
 
   tests('Keys should be canonicalised using Unicode NFC') do
     returns( Fog::AWS.escape( ["00E9".to_i(16)].pack("U*") ) ) { "%C3%A9" }

data/tests/aws/storage_tests.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+Shindo.tests('AWS Storage | escape', ['aws']) do
+  tests('Keys can contain a hierarchical prefix which should not be escaped') do
+    returns( Fog::Storage::AWS.new.send(:escape, "key/with/prefix") ) { "key/with/prefix" }
+  end
+end

data/tests/brightbox/compute/schema.rb

@@ -581,6 +581,7 @@ class Brightbox
           "listeners"       => [Brightbox::Compute::Formats::Struct::LB_LISTENER],
           "policy"          => String,
           "healthcheck"     => Brightbox::Compute::Formats::Struct::LB_HEALTHCHECK,
+          "certificate"     => Fog::Nullable::Hash,
           "created_at"      => String,
           "deleted_at"      => Fog::Nullable::String,
           "account"         => Brightbox::Compute::Formats::Nested::ACCOUNT,

data/tests/brightbox/requests/compute/interface_tests.rb

@@ -5,28 +5,17 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
   tests('success') do
 
     unless Fog.mocking?
-      server = @test_service.servers.first
+      @test_server = Brightbox::Compute::TestSupport.get_test_server
+      @interface_id = @test_server.interfaces.first["id"]
 
-      # If no server is available, create one just for the test
-      unless server
-        @test_server = Brightbox::Compute::TestSupport.get_test_server
-        server = @test_server
+      tests("#get_interface('#{@interface_id}')") do
+        pending if Fog.mocking?
+        result = @test_service.get_interface(@interface_id)
+        data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, {:allow_extra_keys => true}) { result }
       end
 
-      @interface_id = server.interfaces.first["id"]
+      @test_server.destroy
     end
-
-    tests("#get_interface('#{@interface_id}')") do
-      pending if Fog.mocking?
-      result = @test_service.get_interface(@interface_id)
-      data_matches_schema(Brightbox::Compute::Formats::Full::INTERFACE, {:allow_extra_keys => true}) { result }
-    end
-
-    unless Fog.mocking?
-      # If we created a server just for this test, clean it up
-      @test_server.destroy if @test_server
-    end
-
   end
 
   tests('failure') do
@@ -41,5 +30,4 @@ Shindo.tests('Fog::Compute[:brightbox] | interface requests', ['brightbox']) do
       @test_service.get_interface()
     end
   end
-
 end

data/tests/compute/helper.rb

@@ -21,17 +21,19 @@ def compute_providers
     },
     :ecloud => {
       :server_attributes => {
-        :name                 => "eugene",
-        :row                  => "eugene1",
-        :group                => "eugene-104",
+        :name                 => "VM4",
+        :row                  => "Layout Row 1",
+        :group                => "Layout Group 1",
         :catalog_network_name => "bridged",
         :description          => "blarg",
         :operating_system => {
           :name =>  "Red Hat Enterprise Linux 5 (64-bit)",
           :href => "/cloudapi/ecloud/operatingsystems/rhel5_64guest/computepools/963",
         },
+        :organization_uri => 'organizations/2'
       }.tap do |hash|
-        [:template_href, :network_uri, :environment_name].each do |k|
+        [:template_href, :network_uri,
+         :environment_name, :organization_uri].each do |k|
           key = "ecloud_#{k}".to_sym
           if Fog.credentials[key]
             hash[k]= Fog.credentials[key]

data/tests/core/credential_tests.rb

@@ -54,7 +54,13 @@ Shindo.tests do
     returns(nil, 'File.expand_path raises because of non-absolute path') {
       ENV.delete('FOG_RC')
       ENV['HOME'] = '.'
-      Fog.credentials_path
+
+      if RUBY_PLATFORM == 'java'
+        Fog::Logger.warning("Stubbing out non-absolute path credentials test due to JRuby bug: https://github.com/jruby/jruby/issues/1163")
+        nil
+      else
+        Fog.credentials_path
+      end
     }
 
     returns(nil, 'returns nil when neither FOG_RC or HOME are set') {

data/tests/core/parser_tests.rb

@@ -46,7 +46,7 @@ posuere eu odio. Donec sodales, ante porta condimentum
 }
 
   @xmlNS = %{
-<myns:MyResponse>
+<myns:MyResponse xmlns:myns="http://www.example.com/">
   <myns:MyObject>
     <myns:key1>value1</myns:key1>
     <myns:key2>value2</myns:key2>

data/tests/core/uuid_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::UUID', 'core') do
+
+  tests('supported?').succeeds do
+    Fog::UUID.supported? == SecureRandom.respond_to?(:uuid)
+  end
+
+  tests('success').succeeds do
+    Fog::UUID.uuid =~ /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+  end
+end