openstack 1.0.1 → 1.0.2

data/README.rdoc

@@ -93,11 +93,12 @@ See the class definitions for documentation on specific methods and operations.
   >> newserver.progress
   => 12
 
-  # Create a new server and specify the keyname to be used (some provider support the Keys extension):
-  >> server = os.create_server({:imageRef=>14075, :flavorRef=>100, :key_name=>"my_default_key", :name=>"marios_server"})
+  # Create a new server and specify the keyname and security_groups to be used (dependent on provider support for these API extensions):
+  >> server = os.create_server({:imageRef=>14075, :flavorRef=>100, :key_name=>"my_default_key", :security_groups=>["test", "default"], :name=>"marios_server"})
   => #<OpenStack::Compute::Server:0x101433f08 ....
   >> server.key_name
   => "my_default_key"
+  >> server.security_groups
 
   # Delete the new server
   >> newserver.delete!
@@ -143,6 +144,41 @@ See the class definitions for documentation on specific methods and operations.
   >> os.delete_keypair("test_key_imported")
   => true
 
+  # List all security groups:
+  >> os.security_groups
+  =>  { "1381" => { :tenant_id=>"12345678909876", :id=>1381, :name=>"default", :description=>"default",
+                    :rules=> [
+                        {:from_port=>22, :group=>{}, :ip_protocol=>"tcp", :to_port=>22,
+                         :parent_group_id=>1381, :ip_range=>{:cidr=>"0.0.0.0/0"}, :id=>4902},
+                             ]
+                   },
+        "1234" => { ... } }
+
+  # Get a specific security group:
+  >> os.security_group(1381)
+  =>  { "1381" => { :tenant_id=>"12345678909876", :id=>1381, :name=>"default", :description=>"default",
+                    :rules=> [
+                        {:from_port=>22, :group=>{}, :ip_protocol=>"tcp", :to_port=>22,
+                         :parent_group_id=>1381, :ip_range=>{:cidr=>"0.0.0.0/0"}, :id=>4902},
+                             ]
+                   }}
+
+  #Create a new security group:
+  >> os.create_security_group("devel_group", "all development machines")
+  => {"9573"=>{:rules=>[], :tenant_id=>"46871569847393", :id=>9573, :name=>"devel_group", :description=>"all development machines"}}
+
+  #Create a new security group rule - first param is id of the security group for this rule. Instead of :cidr you may specify :group_id to use another group as source:
+  >> os.create_security_group_rule(9567, {:ip_protocol=>"tcp", :from_port=>"123", :to_port=>"123", :cidr=>"192.168.0.1/16" })
+  => => {"27375"=>{:from_port=>123, :group=>{}, :ip_protocol=>"tcp", :to_port=>123, :parent_group_id=>9573, :ip_range=>{:cidr=>"192.168.0.1/16"}, :id=>27375}}
+
+  #Delete a security group rule:
+  >> os.delete_security_group_rule(27375)
+  => true
+
+  #Delete a security group:
+  >>  os.delete_security_group(9571)
+  => true
+
 == Examples for Object-Store:
 
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/openstack/compute/address.rb

@@ -1,3 +1,4 @@
+require 'ipaddr'
 module OpenStack
 module Compute
 
@@ -33,6 +34,34 @@ module Compute
         @version = version
       end
     end
+
+    NON_ROUTABLE_ADDRESSES = [IPAddr.new("10.0.0.0/8"), IPAddr.new("192.168.0.0/16"), IPAddr.new("172.16.0.0/12")]
+
+    def self.is_private?(address_string)
+      NON_ROUTABLE_ADDRESSES.each do |no_route|
+        return true if no_route.include?(address_string)
+      end
+      false
+    end
+
+    #IN:  { "private"=> [{"addr"=>"10.7.206.171", "version"=>4}, {"addr"=>"15.185.160.208", "version"=>4}]}
+    #OUT: { "private"=> [{"addr"=>"10.7.206.171", "version"=>4}],
+    #       "public"=>  [{"addr"=>"15.185.160.208", "version"=>4}] }
+    def self.fix_labels(addresses_info)
+      addresses_info.inject({"public"=>[], "private"=>[]}) do |res, (label,address_struct_list)|
+        address_struct_list.each do |address_struct|
+          if(address_struct["version"==6])#v6 addresses are all routable...
+            res["public"] << address_struct
+          else
+            is_private?(address_struct["addr"])? res["private"] << address_struct : res["public"] << address_struct
+          end
+        end
+        res
+      end
+    end
+
+
+
   end
 
 end

data/lib/openstack/compute/connection.rb

@@ -4,8 +4,10 @@ module Compute
   class Connection
 
     attr_accessor   :connection
+    attr_accessor   :extensions
 
     def initialize(connection)
+      @extensions = nil
       @connection = connection
       OpenStack::Authentication.init(@connection)
     end
@@ -63,14 +65,19 @@ module Compute
       path = OpenStack.paginate(options).empty? ? "#{@connection.service_path}/servers/detail" : "#{@connection.service_path}/servers/detail?#{OpenStack.paginate(options)}"
       response = @connection.csreq("GET",@connection.service_host,path,@connection.service_port,@connection.service_scheme)
       OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      OpenStack.symbolize_keys(JSON.parse(response.body)["servers"])
+      json_server_list = JSON.parse(response.body)["servers"]
+      json_server_list.each do |server|
+        server["addresses"] = OpenStack::Compute::Address.fix_labels(server["addresses"])
+      end
+      OpenStack.symbolize_keys(json_server_list)
     end
     alias :servers_detail :list_servers_detail
 
     # Creates a new server instance on OpenStack Compute
     #
     # The argument is a hash of options.  The keys :name, :flavorRef,
-    # and :imageRef are required; :metadata and :personality are optional.
+    # and :imageRef are required; :metadata, :security_groups,
+    # :key_name and :personality are optional.
     #
     # :flavorRef and :imageRef are href strings identifying a particular
     # server flavor and image to use when building the server.  The :imageRef
@@ -94,7 +101,9 @@ module Compute
     #        :imageRef    => '3',
     #        :flavorRef   => '1',
     #        :metadata    => {'Racker' => 'Fanatical'},
-    #        :personality => {'/home/bob/wedding.jpg' => '/root/wedding.jpg'})
+    #        :personality => {'/home/bob/wedding.jpg' => '/root/wedding.jpg'},
+    #        :key_name    => "mykey",
+    #        :security_groups => [ "devel", "test"])
     #   => #<OpenStack::Compute::Server:0x101229eb0 ...>
     #   >> server.name
     #   => "NewServer"
@@ -105,6 +114,7 @@ module Compute
     def create_server(options)
       raise OpenStack::Exception::MissingArgument, "Server name, flavorRef, and imageRef, must be supplied" unless (options[:name] && options[:flavorRef] && options[:imageRef])
       options[:personality] = Personalities.get_personality(options[:personality])
+      options[:security_groups] = (options[:security_groups] || []).inject([]){|res, c| res << {"name"=>c} ;res}
       data = JSON.generate(:server => options)
       response = @connection.csreq("POST",@connection.service_host,"#{@connection.service_path}/servers",@connection.service_port,@connection.service_scheme,{'content-type' => 'application/json'},data)
       OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
@@ -228,10 +238,13 @@ module Compute
     # }
     #
     def api_extensions
-      response = @connection.req("GET", "/extensions")
-      OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
-      res = OpenStack.symbolize_keys(JSON.parse(response.body))
-      res[:extensions].inject({}){|result, c| result[c[:alias].to_sym] = c  ; result}
+      if @extensions.nil?
+        response = @connection.req("GET", "/extensions")
+        OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
+        res = OpenStack.symbolize_keys(JSON.parse(response.body))
+        @extensions = res[:extensions].inject({}){|result, c| result[c[:alias].to_sym] = c  ; result}
+      end
+      @extensions
     end
 
     # Retrieve a list of key pairs associated with the current authenticated account
@@ -313,6 +326,67 @@ module Compute
       true
     end
 
+    #Security Groups:
+    #Returns a hash with the security group IDs as keys:
+    #=> { "1381" => { :tenant_id=>"12345678909876", :id=>1381, :name=>"default", :description=>"default",
+    #                 :rules=> [
+    #                           {:from_port=>22, :group=>{}, :ip_protocol=>"tcp", :to_port=>22,
+    #                            :parent_group_id=>1381, :ip_range=>{:cidr=>"0.0.0.0/0"}, :id=>4902},
+    #                           {:from_port=>80, :group=>{}, :ip_protocol=>"tcp", :to_port=>80,
+    #                            :parent_group_id=>1381, :ip_range=>{:cidr=>"0.0.0.0/0"}, :id=>4903},
+    #                           {:from_port=>443, :group=>{}, :ip_protocol=>"tcp", :to_port=>443,
+    #                            :parent_group_id=>1381, :ip_range=>{:cidr=>"0.0.0.0/0"}, :id=>4904},
+    #                           {:from_port=>-1, :group=>{}, :ip_protocol=>"icmp", :to_port=>-1,
+    #                            :parent_group_id=>1381, :ip_range=>{:cidr=>"0.0.0.0/0"}, :id=>4905}],
+    #                          ]
+    #               },
+    #     "1234" => { ... } }
+    #
+    def security_groups
+      raise OpenStack::Exception::NotImplemented.new("os-security-groups not implemented by #{@connection.http.keys.first}", 501, "NOT IMPLEMENTED") unless api_extensions[:"os-security-groups"] or api_extensions[:security_groups]
+      response = @connection.req("GET", "/os-security-groups")
+      res = OpenStack.symbolize_keys(JSON.parse(response.body))
+      res[:security_groups].inject({}){|result, c| result[c[:id].to_s] = c ; result }
+    end
+
+    def security_group(id)
+      raise OpenStack::Exception::NotImplemented.new("os-security-groups not implemented by #{@connection.http.keys.first}", 501, "NOT IMPLEMENTED") unless api_extensions[:"os-security-groups"] or api_extensions[:security_groups]
+      response = @connection.req("GET", "/os-security-groups/#{id}")
+      res = OpenStack.symbolize_keys(JSON.parse(response.body))
+      {res[:security_group][:id].to_s => res[:security_group]}
+    end
+
+    def create_security_group(name, description)
+      raise OpenStack::Exception::NotImplemented.new("os-security-groups not implemented by #{@connection.http.keys.first}", 501, "NOT IMPLEMENTED") unless api_extensions[:"os-security-groups"] or api_extensions[:security_groups]
+      data = JSON.generate(:security_group => { "name" => name, "description" => description})
+      response = @connection.req("POST", "/os-security-groups", {:data => data})
+      res = OpenStack.symbolize_keys(JSON.parse(response.body))
+      {res[:security_group][:id].to_s => res[:security_group]}
+    end
+
+    def delete_security_group(id)
+      raise OpenStack::Exception::NotImplemented.new("os-security-groups not implemented by #{@connection.http.keys.first}", 501, "NOT IMPLEMENTED") unless api_extensions[:"os-security-groups"] or api_extensions[:security_groups]
+      response = @connection.req("DELETE", "/os-security-groups/#{id}")
+      true
+    end
+
+    #params: { :ip_protocol=>"tcp", :from_port=>"123", :to_port=>"123", :cidr=>"192.168.0.1/16", :group_id:="123" }
+    #observed behaviour against Openstack@HP cloud - can specify either cidr OR group_id as source, but not both
+    #if both specified, the group is used and the cidr ignored.
+    def create_security_group_rule(security_group_id, params)
+      raise OpenStack::Exception::NotImplemented.new("os-security-groups not implemented by #{@connection.http.keys.first}", 501, "NOT IMPLEMENTED") unless api_extensions[:"os-security-groups"] or api_extensions[:security_groups]
+      params.merge!({:parent_group_id=>security_group_id.to_s})
+      data = JSON.generate(:security_group_rule => params)
+      response = @connection.req("POST", "/os-security-group-rules", {:data => data})
+      res = OpenStack.symbolize_keys(JSON.parse(response.body))
+      {res[:security_group_rule][:id].to_s => res[:security_group_rule]}
+    end
+
+    def delete_security_group_rule(id)
+      raise OpenStack::Exception::NotImplemented.new("os-security-groups not implemented by #{@connection.http.keys.first}", 501, "NOT IMPLEMENTED") unless api_extensions[:"os-security-groups"] or api_extensions[:security_groups]
+      response = @connection.req("DELETE", "/os-security-group-rules/#{id}")
+      true
+    end
   end
 end
 end

data/lib/openstack/compute/server.rb

@@ -17,6 +17,7 @@ module Compute
     attr_reader   :metadata
     attr_accessor :adminPass
     attr_reader   :key_name
+    attr_reader   :security_groups
 
     # This class is the representation of a single Server object.  The constructor finds the server identified by the specified
     # ID number, accesses the API via the populate method to get information about that server, and returns the object.
@@ -53,7 +54,7 @@ module Compute
           OpenStack::Exception.raise_exception(response) unless response.code.match(/^20.$/)
           data = JSON.parse(response.body)["server"]
       end
-      @id        = data["id"]
+      @id        = data["uuid"]
       @name      = data["name"]
       @status    = data["status"]
       @progress  = data["progress"]
@@ -63,6 +64,7 @@ module Compute
       @image   = data["image"]
       @flavor  = data["flavor"]
       @key_name = data["key_name"] # if provider uses the keys API extension for accessing servers
+      @security_groups = data["security_groups"].inject([]){|res, c| res << c["id"]  ; res}
       true
     end
     alias :refresh :populate
@@ -234,6 +236,7 @@ module Compute
     end
 
     def get_addresses(address_info)
+      address_info = OpenStack::Compute::Address.fix_labels(address_info)
       address_list = OpenStack::Compute::AddressList.new
       address_info.each do |label, addr|
         addr.each do |address|

metadata

@@ -1,48 +1,42 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: openstack
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 1.0.2
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Dan Prince
 - Marios Andreou
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: API Binding for OpenStack
-email: 
+email:
 - dprince@redhat.com
 - marios@redhat.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - COPYING
 - README.rdoc
 - VERSION
@@ -60,37 +54,27 @@ files:
 - lib/openstack/swift/storage_object.rb
 homepage: https://github.com/ruby-openstack/ruby-openstack
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OpenStack Ruby API
 test_files: []
-
-has_rdoc: false
+has_rdoc: