kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[hp|compute_v2] Add capability to pass networks while creating a server.

Browse source
This commit is contained in:
Rupak Ganguly 2013-04-25 16:28:26 -04:00
parent 1f64462032
commit e7ca2aa8e4
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/fog/hp/requests/compute_v2/create_server.rb
View file

@ -11,6 +11,7 @@ module Fog
# * 'image_id'<~String> - UUId of image for server. If block_device_mapping is passed, this is ignored. # * 'image_id'<~String> - UUId of image for server. If block_device_mapping is passed, this is ignored.
# * options<~Hash>: # * options<~Hash>:
# * 'availability_zone'<~String> - Availability zone where the server should be created. Defaults to 'az2'. # * 'availability_zone'<~String> - Availability zone where the server should be created. Defaults to 'az2'.
# * 'networks'<~Array> - List of network ids to be associated with the server at creation.
# * 'metadata'<~Hash> - Up to 5 key value pairs containing 255 bytes of info # * 'metadata'<~Hash> - Up to 5 key value pairs containing 255 bytes of info
# * 'min_count'<~Integer> - Number of servers to create. Defaults to 1. # * 'min_count'<~Integer> - Number of servers to create. Defaults to 1.
# * 'max_count'<~Integer> - Max. number of servers to create. Defaults to being equal to min_count. # * 'max_count'<~Integer> - Max. number of servers to create. Defaults to being equal to min_count.
@ -53,9 +54,7 @@ module Fog
# * 'uuid'<~String> - uuid of the server # * 'uuid'<~String> - uuid of the server
# * 'config_drive'<~String> - config drive # * 'config_drive'<~String> - config drive
# * 'security_groups'<~Array of Hash> # * 'security_groups'<~Array of Hash>
# * 'id'<~Integer> - id of the security group
# * 'name'<~String> - name of the security group # * 'name'<~String> - name of the security group
# * 'links'<~Array> - array of security group links
# * 'key_name'<~String> - name of the keypair # * 'key_name'<~String> - name of the keypair
# * 'adminPass'<~String> - admin password for server # * 'adminPass'<~String> - admin password for server
def create_server(name, flavor_id, image_id, options = {}) def create_server(name, flavor_id, image_id, options = {})
@ -94,6 +93,16 @@ module Fog
end end
end end
# add capability to specify a network id while creating a server
if options['networks']
data['server']['networks'] = []
for net_id in options['networks']
data['server']['networks'] << {
'uuid' => net_id
}
end
end
request( request(
:body => Fog::JSON.encode(data), :body => Fog::JSON.encode(data),
:expects => 202, :expects => 202,
@ -115,26 +124,27 @@ module Fog
else else
sec_group_name = "default" sec_group_name = "default"
end end
id = Fog::HP::Mock.uuid.to_s
data = { data = {
'addresses' => { "private"=>[{"version"=>4, "addr"=>Fog::HP::Mock.ip_address}] }, 'addresses' => { "custom"=>[{"version"=>4, "addr"=>Fog::HP::Mock.ip_address}] },
'flavor' => {"id"=>"#{flavor_id}", "links"=>[{"href"=>"http://nova1:8774/admin/flavors/#{flavor_id}", "rel"=>"bookmark"}]}, 'flavor' => {"id"=>"#{flavor_id}", "links"=>[{"href"=>"http://nova1:8774/admin/flavors/#{flavor_id}", "rel"=>"bookmark"}]},
'id' => Fog::Mock.random_numbers(6).to_i, 'id' => id,
'image' => {"id"=>"#{image_id}", "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_id}", "rel"=>"bookmark"}]}, 'image' => {"id"=>"#{image_id}", "links"=>[{"href"=>"http://nova1:8774/admin/images/#{image_id}", "rel"=>"bookmark"}]},
'links' => [{"href"=>"http://nova1:8774/v1.1/admin/servers/5", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/5", "rel"=>"bookmark"}], 'links' => [{"href"=>"http://nova1:8774/v1.1/admin/servers/#{id}", "rel"=>"self"}, {"href"=>"http://nova1:8774/admin/servers/#{id}", "rel"=>"bookmark"}],
'hostId' => "123456789ABCDEF01234567890ABCDEF", 'hostId' => "123456789ABCDEF01234567890ABCDEF",
'metadata' => options['metadata'] || {}, 'metadata' => options['metadata'] || {},
'name' => name || "server_#{rand(999)}", 'name' => name || "server_#{rand(999)}",
'accessIPv4' => options['accessIPv4'] || "", 'accessIPv4' => options['accessIPv4'] || "",
'accessIPv6' => options['accessIPv6'] || "", 'accessIPv6' => options['accessIPv6'] || "",
'progress' => 0, 'progress' => 0,
'status' => 'BUILD', 'status' => 'ACTIVE',
'created' => "2012-01-01T13:32:20Z", 'created' => "2012-01-01T13:32:20Z",
'updated' => "2012-01-01T13:32:20Z", 'updated' => "2012-01-01T13:32:20Z",
'user_id' => Fog::HP::Mock.user_id.to_s, 'user_id' => Fog::HP::Mock.user_id.to_s,
'tenant_id' => Fog::HP::Mock.user_id.to_s, 'tenant_id' => Fog::Mock.random_numbers(14).to_s,
'uuid' => "95253a45-9ead-43c6-90b3-65da2ef048b3",
'config_drive' => "", 'config_drive' => "",
'security_groups' => [{"name"=>"#{sec_group_name}", "links"=>[{"href"=>"http://nova1:8774/v1.1/admin//os-security-groups/111", "rel"=>"bookmark"}], "id"=>111}], 'security_groups' => [{"name"=>"#{sec_group_name}"}],
'key_name' => options['key_name'] || "" 'key_name' => options['key_name'] || ""
} }
self.data[:last_modified][:servers][data['id']] = Time.now self.data[:last_modified][:servers][data['id']] = Time.now

2
lib/fog/hp/requests/compute_v2/update_server.rb
View file

@ -9,6 +9,8 @@ module Fog
# * 'server_id'<~String> - UUId of the server to update # * 'server_id'<~String> - UUId of the server to update
# * options<~Hash>: # * options<~Hash>:
# * 'name'<~String> - New name for server # * 'name'<~String> - New name for server
# * 'accessIPv4'<~String> - IPv4 IP address
# * 'accessIPv6'<~String> - IPv6 IP address
# #
# ==== Returns # ==== Returns
# * response<~Excon::Response>: # * response<~Excon::Response>: