openstack-quantum-messager 0.0.1 → 0.0.2

data/lib/openstack-quantum-messager.rb

@@ -3,3 +3,12 @@ require "httparty"
 require "json"
 require "openstack-quantum-messager/version"
 require "openstack-quantum-messager/l2l3"
+require "openstack-quantum-messager/l2l3/attachment_detail"
+require "openstack-quantum-messager/l2l3/dhcp"
+require "openstack-quantum-messager/l2l3/dhcp_entry"
+require "openstack-quantum-messager/l2l3/firewall"
+require "openstack-quantum-messager/l2l3/filter_rule"
+require "openstack-quantum-messager/l2l3/filtered_range"
+require "openstack-quantum-messager/l2l3/network"
+require "openstack-quantum-messager/l2l3/port"
+

data/lib/openstack-quantum-messager/l2l3.rb

@@ -2,28 +2,68 @@
 module Openstack
   module QuantumMessager
     class L2l3
-      def initialize(quantum_url)
-        @quantum_url = quantum_url
+      attr_reader :quantum_url
+      attr_reader :quantum_extension_url
+
+      # The initialize l2l3 class should be initialized passing a hash
+      # with url and tenant:
+      # Example:
+      #
+      #   {:url => "http://localhost:9696", :tenant => "XYZ"}
+      def initialize(config)
+        @quantum_extension_url = "#{config[:url]}/v1.0/extensions/l2l3/tenants/#{config[:tenant]}"
+        @quantum_url = "#{config[:url]}/v1.0/tenants/#{config[:tenant]}"
+      end
+
+      def attachment_detail
+        @attachment_detail ||= AttachmentDetail.new(@quantum_extension_url)
+      end
+
+      def firewall
+        @firewall ||= Firewall.new(@quantum_extension_url)
+      end
+
+      def filtered_range
+        @filtered_range ||= FilteredRange.new(@quantum_extension_url)
+      end
+
+      def filter_rule
+        @filter_rule ||= FilterRule.new(@quantum_extension_url)
+      end
+
+      def dhcp
+        @dhcp ||= Dhcp.new(@quantum_extension_url)
+      end
+
+      def dhcp_entry
+        @dhcp_entry ||= DhcpEntry.new(@quantum_extension_url)
+      end
+
+      def port
+        @port ||= Port.new(@quantum_url, @quantum_extension_url)
+      end
+
+      def network
+        @network ||= Network.new(@quantum_url, @quantum_extension_url)
       end
 
-      def add_dhcp(name, address)
-        dhcp_info = {"dhcp" => {"name" => name, "address" => address}}
-        post_to_quantum(dhcp_info, "/dhcps.json")
+      protected
+      def post_to_quantum(post_url, info)
+        send_to_quantum("post", post_url, info)
       end
 
-      def add_dhcp_entry(address, mac)
-        dhcp_entry_info = {"dhcp_entry" => {"mac" => mac, "address" => address}}
-        post_to_quantum(dhcp_entry_info, "/dhcp_entries.json")
+      def put_to_quantum(post_url, info)
+        send_to_quantum("put", post_url, info)
       end
 
-      private
-      def post_to_quantum(info, url_suffix)
-        response = HTTParty.post(
-          @quantum_url + url_suffix,
+      def send_to_quantum(http_method, post_url, info)
+        response = HTTParty.send(
+          http_method,
+          post_url,
           :body => info.to_json,
           :headers => {"Content-Type" => "application/json"}
         )
-        response.body if response
+        response
       end
     end
   end

data/lib/openstack-quantum-messager/l2l3/attachment_detail.rb

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class AttachmentDetail < L2l3
+      def initialize(quantum_extension_url)
+        @quantum_extension_url = quantum_extension_url
+      end
+
+      def list(filters={})
+        HTTParty.get("#{quantum_extension_url}/attachment_details.json", :query => filters)
+      end
+
+      def create(mac, ip)
+        url = "#{quantum_extension_url}/attachment_details.json"
+        post_to_quantum(url, {"attachment_detail" => {"interface_id" => mac, "ip" => ip}})
+      end
+
+      def delete(id)
+        url = "#{quantum_extension_url}/attachment_details/#{id}.json"
+        HTTParty.delete(url)
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/dhcp.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class Dhcp < L2l3
+      def initialize(quantum_url)
+        @quantum_url = "#{quantum_url}/dhcps.json"
+      end
+
+      def create(name, address)
+        post_to_quantum(
+          @quantum_url,
+          {"dhcp" => {"name" => name, "address" => address}}
+        )
+      end
+
+      def list
+        response = HTTParty.get(@quantum_url)
+        JSON.parse(response.body)["dhcps"] if response
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/dhcp_entry.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class DhcpEntry < L2l3
+      def initialize(quantum_url)
+        @quantum_url = "#{quantum_url}/dhcp_entries.json"
+      end
+
+      def create(address, mac)
+        post_to_quantum(
+          @quantum_url,
+          {"dhcp_entry" => {"mac" => mac, "address" => address}}
+        )
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/filter_rule.rb

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class FilterRule < L2l3
+      def initialize(quantum_url)
+        @quantum_url = quantum_url
+      end
+
+      def create(src, dst, dst_port, proto)
+        full_url = "#{@quantum_url}/filter_rules.json"
+        post_hash = {
+          "filter_rule" => {
+            "src"       => src,
+            "dst"       => dst,
+            "dst_port"  => dst_port,
+            "proto"     => proto
+          }
+        }
+        post_to_quantum(full_url, post_hash)
+      end
+
+      def delete(id)
+        HTTParty.delete("#{@quantum_url}/filter_rules/#{id}.json" )
+      end
+
+      def show(id)
+        HTTParty.get("#{@quantum_url}/filter_rules/#{id}.json" )
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/filtered_range.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class FilteredRange < L2l3
+      def initialize(quantum_url)
+        @quantum_url = "#{quantum_url}/firewalls/%s/filtered_ranges.json"
+      end
+
+      def create(firewall_uuid, address, mask)
+        post_to_quantum(
+          @quantum_url % firewall_uuid.to_s,
+          {"filtered_range" => {"address" => address, "mask" => mask}}
+        )
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/firewall.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class Firewall < L2l3
+      def initialize(quantum_url)
+        @quantum_url = "#{quantum_url}/firewalls.json"
+      end
+
+      def create(name, address)
+        post_to_quantum(
+          @quantum_url,
+          {"firewall" => {"name" => name, "address" => address}}
+        )
+      end
+
+      def list
+        response = HTTParty.get(@quantum_url)
+        JSON.parse(response.body)["firewalls"] if response
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/network.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class Network < L2l3
+      def initialize(quantum_url, quantum_extension_url)
+        @quantum_url = quantum_url
+        @quantum_extension_url = quantum_extension_url
+      end
+
+      def create(name)
+        full_url = "#{@quantum_url}/networks.json"
+        post_to_quantum(full_url, {"network" => {"name" => name}})
+      end
+
+      def list(filters={})
+        HTTParty.get("#{@quantum_extension_url}/networks.json", :query => filters)
+      end
+
+      def show(id)
+        HTTParty.get("#{@quantum_url}/networks/#{id}.json")
+      end
+
+      def find_or_create_by_name(network_name)
+        networks = list(:name => network_name)
+        if networks.empty?
+          create(network_name)
+        end
+        list(:name => network_name)["networks"].last
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/l2l3/port.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+module Openstack
+  module QuantumMessager
+    class Port < L2l3
+      def initialize(quantum_url, quantum_extension_url)
+        @quantum_url = quantum_url
+        @quantum_extension_url = quantum_extension_url
+      end
+
+      def create(network_id)
+        full_url = "#{@quantum_url}/networks/#{network_id}/ports.json"
+        post_to_quantum(full_url, nil)
+      end
+
+      def plug(network_id, id, interface_id)
+        full_url = "#{@quantum_url}/networks/#{network_id}/ports/#{id}/attachment.json"
+        response = put_to_quantum(full_url, {"attachment" => {"id" => interface_id}})
+        response.code < 300
+      end
+
+      def unplug(network_id, id)
+        full_url = "#{@quantum_url}/networks/#{network_id}/ports/#{id}/attachment.json"
+        response = HTTParty.delete(full_url)
+        response.code < 300
+      end
+
+      def delete(network_id, id)
+        HTTParty.delete("#{@quantum_url}/networks/#{network_id}/ports/#{id}.json")
+      end
+
+      def list(network_id, filters={})
+        HTTParty.get("#{@quantum_extension_url}/networks/#{network_id}/ports.json", :query => filters)
+      end
+    end
+  end
+end

data/lib/openstack-quantum-messager/version.rb

@@ -1,5 +1,5 @@
 module Openstack
   module QuantumMessager
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/openstack-quantum-messager/l2l3/attachment_detail_spec.rb

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::AttachmentDetail do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @attachment_detail = {"attachment_detail" => {"interface_id" => "a4:ba:db:05:6e:f8", "ip" => "192.168.3.4"}}
+  end
+
+  it "should generate the correct json syntax for attachment_detail creation" do
+    url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/attachment_details.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => @attachment_detail.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.attachment_detail.create("a4:ba:db:05:6e:f8", "192.168.3.4")
+  end
+
+  it "should return the attachment_detail uuid" do
+    attachment_detail = @messager.attachment_detail.create("a4:ba:db:05:6e:f8", "192.168.3.4")
+    attachment_detail.should_not be_nil
+    attachment_detail["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+
+  it "should delete the attachment_detail" do
+    attachment_detail = @messager.attachment_detail.create("a4:ba:db:05:6e:f8", "192.168.3.4")
+    response_code = @messager.attachment_detail.delete(attachment_detail["id"]).code
+    response_code.should == 200
+  end
+
+  it "should list the attachment_details" do
+    mac = "a4:ba:db:05:6e:f9"
+    @messager.attachment_detail.create(mac, "192.168.3.4")
+    attachment_details = @messager.attachment_detail.list(:attachment => mac)["attachment_details"]
+    attachment_details.size.should == 1
+    attachment_details.first["interface_id"].should == mac
+  end
+end

data/spec/openstack-quantum-messager/l2l3/dhcp_entry_spec.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::DhcpEntry do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @dhcp_entry_info = {"dhcp_entry" => {"mac" => "a4:ba:db:05:6e:f8", "address" => "192.168.3.4"}}
+  end
+
+  it "should generate the correct json syntax for dhcp inclusion" do
+    url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/dhcp_entries.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => @dhcp_entry_info.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.dhcp_entry.create("192.168.3.4", "a4:ba:db:05:6e:f8")
+  end
+
+  it "should return the dhcp uuid" do
+    dhcp_entry_info = @messager.dhcp.create("dhcp1", "192.168.3.4")
+    dhcp_entry_info.should_not be_nil
+    dhcp_entry_info["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+end

data/spec/openstack-quantum-messager/l2l3/dhcp_spec.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::Dhcp do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @dhcp_info = {"dhcp" => {"name" => "dhcp1", "address" => "192.168.1.1"} }
+  end
+
+  it "should generate the correct json syntax for dhcp inclusion" do
+    url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/dhcps.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => @dhcp_info.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.dhcp.create("dhcp1", "192.168.1.1")
+  end
+
+  it "should return the dhcp uuid" do
+    dhcp_info = @messager.dhcp.create("dhcp1", "192.168.1.1")
+    dhcp_info.should_not be_nil
+    dhcp_info["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+
+  it "should return a dhcps array" do
+    dhcp_info = @messager.dhcp.list
+    dhcp_info.should_not be_nil
+    dhcp_info.should be_instance_of(Array)
+  end
+end

data/spec/openstack-quantum-messager/l2l3/filter_rule_spec.rb

@@ -0,0 +1,61 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::FilterRule do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @filter_rule_info = {
+      "filter_rule" => {
+        "src" => "192.168.1.1/32",
+        "dst" => "10.0.0.1",
+        "dst_port" => 22,
+        "proto" => "tcp"
+      }
+    }
+  end
+
+  it "should generate the correct json syntax for filter_rule inclusion" do
+    url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/filter_rules.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => @filter_rule_info.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.filter_rule.create("192.168.1.1/32","10.0.0.1",22,"tcp")
+  end
+
+  it "should return the filter_rule uuid" do
+    filter_rule_info = @messager.filter_rule.create("192.168.1.1/32","10.0.0.1",22,"tcp")
+    filter_rule_info.should_not be_nil
+    filter_rule_info["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+
+  context "when using rule uuid" do
+    it "should delete the filter_rule by uuid" do
+      rule = @messager.filter_rule.create("192.168.1.1/32","10.0.0.1",22,"tcp")
+
+      filter_rule_info = @messager.filter_rule.delete(rule["id"])
+      filter_rule_info.should_not be_nil
+      filter_rule_info["id"].should match(rule["id"])
+    end
+
+    it "should get the filter_rule by uuid" do
+      rule = @messager.filter_rule.create("192.168.1.1/32","10.0.0.1",22,"tcp")
+
+      filter_rule_info = @messager.filter_rule.show(rule["id"])
+      filter_rule_info.should_not be_nil
+      filter_rule_info["id"].should match(rule["id"])
+      filter_rule_info["src"].should match(rule["src"])
+    end
+
+    it "should get the filter_rule status" do
+      firewall = @messager.firewall.create("firewall1", "192.168.1.1")
+      filtered_range = @messager.filtered_range.create(firewall["id"], "10.0.0.1", "26")
+      rule = @messager.filter_rule.create("192.168.1.1/32","10.0.0.1",22,"tcp")
+
+      filter_rule_info = @messager.filter_rule.show(rule["id"])
+      filter_rule_info["status"].should match("INSERTING")
+    end
+  end
+end

data/spec/openstack-quantum-messager/l2l3/filtered_range_spec.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::FilteredRange do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @filtered_range_info = {"filtered_range" => {"address" => "192.168.1.1", "mask" => "26"}}
+
+    @firewall = @messager.firewall.create("firewall1", "192.168.1.1")
+  end
+
+  it "should generate the correct json syntax for firewall inclusion" do
+    url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/firewalls/%s/filtered_ranges.json"
+    HTTParty.should_receive(:post).with(
+      url % @firewall["uuid"],
+      :body => @filtered_range_info.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.filtered_range.create(@firewall["uuid"], "192.168.1.1", "26")
+  end
+end

data/spec/openstack-quantum-messager/l2l3/firewall_spec.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::Firewall do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @firewall_info = {"firewall" => {"name" => "firewall1", "address" => "192.168.1.1"} }
+  end
+
+  it "should generate the correct json syntax for firewall inclusion" do
+    url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/firewalls.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => @firewall_info.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.firewall.create("firewall1", "192.168.1.1")
+  end
+
+  it "should return the firewall uuid" do
+    firewall_info = @messager.firewall.create("firewall1", "192.168.1.1")
+    firewall_info.should_not be_nil
+    firewall_info["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+
+  it "should return a firewalls array" do
+    firewall_info = @messager.firewall.list
+    firewall_info.should_not be_nil
+    firewall_info.should be_instance_of(Array)
+  end
+end

data/spec/openstack-quantum-messager/l2l3/network_spec.rb

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::Network do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @network_info = {"network" => {"name" => "network1"}}
+  end
+
+  it "should generate the correct json syntax for network inclusion" do
+    url = "http://localhost:9696/v1.0/tenants/XYZ/networks.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => @network_info.to_json,
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.network.create("network1")
+  end
+
+  it "should return the network uuid" do
+    network_info = @messager.network.create("network1")["network"]
+    network_info.should_not be_nil
+    network_info["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+
+  it "should list networks filtered" do
+    @messager.network.create("network1")
+    @messager.network.create("network2")
+    network_list = @messager.network.list(:name => "network2")["networks"]
+    network_list.size.should == 1
+    network_info = @messager.network.show(network_list.first["id"])["network"]
+    network_info["name"].should == "network2"
+  end
+
+  it "should return the last network created by name" do
+    network_id = @messager.network.create("network1")
+    network = @messager.network.find_or_create_by_name("network1")
+    network["id"].should eql(network_id["network"]["id"])
+  end
+end

data/spec/openstack-quantum-messager/l2l3/port_spec.rb

@@ -0,0 +1,46 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Openstack::QuantumMessager::Port do
+  before do
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
+    @port_info = {}
+    @network_id = @messager.network.create("net")["network"]["id"]
+  end
+
+  it "should generate the correct json syntax for port inclusion" do
+    url = "http://localhost:9696/v1.0/tenants/XYZ/networks/#{@network_id}/ports.json"
+    HTTParty.should_receive(:post).with(
+      url,
+      :body => "null",
+      :headers => {"Content-Type" => "application/json"}
+    )
+    @messager.port.create(@network_id)
+  end
+
+  it "should return the port uuid" do
+    port_info = @messager.port.create(@network_id)["port"]
+    port_info.should_not be_nil
+    port_info["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
+  end
+
+  it "should plug an interface" do
+    mac = "4a:94:c4:98:38:57"
+    port_info = @messager.port.create(@network_id)["port"]
+    @messager.port.plug(@network_id, port_info["id"], mac).should be_true
+    new_port_info = @messager.port.list(@network_id, :attachment => mac)["ports"].first
+    new_port_info["id"].should == port_info["id"]
+  end
+
+  it "should unplug an interface" do
+    mac = "4a:94:c4:98:38:57"
+    port_info = @messager.port.create(@network_id)["port"]
+    @messager.port.unplug(@network_id, port_info["id"]).should be_true
+  end
+
+  it "should delete the port" do
+    port_info = @messager.port.create(@network_id)["port"]
+    @messager.port.delete(@network_id, port_info["id"]).code.should == 204
+  end
+end

data/spec/openstack-quantum-messager/l2l3_spec.rb

@@ -3,53 +3,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Openstack::QuantumMessager::L2l3 do
   before do
-    @quantum_url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ"
-    @messager = Openstack::QuantumMessager::L2l3.new(@quantum_url)
+    config = {:url => "http://localhost:9696", :tenant => "XYZ"}
+    @messager = Openstack::QuantumMessager::L2l3.new(config)
   end
 
-  context "when dealing with dhcps" do
-    before do
-      @dhcp_info = {"dhcp" => {"name" => "dhcp1", "address" => "192.168.1.1"} }
-    end
-
-    it "should generate the correct json syntax for dhcp inclusion" do
-      url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/dhcps.json"
-      HTTParty.should_receive(:post).with(
-        url,
-        :body => @dhcp_info.to_json,
-        :headers => {"Content-Type" => "application/json"}
-      )
-      @messager.add_dhcp("dhcp1", "192.168.1.1")
-    end
-
-    it "should return the dhcp uuid" do
-      dhcp_info = @messager.add_dhcp("dhcp1", "192.168.1.1")
-      dhcp_info.should_not be_nil
-      JSON.parse(dhcp_info)["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
-    end
-
+  it "should generate the correct url" do
+    @messager.quantum_extension_url.should eql("http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ")
   end
 
-  context "when dealing with dhcps entrys" do
-    before do
-      @dhcp_entry_info = {"dhcp_entry" => {"mac" => "a4:ba:db:05:6e:f8", "address" => "192.168.3.4"}}
-    end
-
-    it "should generate the correct json syntax for dhcp inclusion" do
-      url = "http://localhost:9696/v1.0/extensions/l2l3/tenants/XYZ/dhcp_entries.json"
-      HTTParty.should_receive(:post).with(
-        url,
-        :body => @dhcp_entry_info.to_json,
-        :headers => {"Content-Type" => "application/json"}
-      )
-      @messager.add_dhcp_entry("192.168.3.4", "a4:ba:db:05:6e:f8")
-    end
-
-    it "should return the dhcp uuid" do
-      dhcp_entry_info = @messager.add_dhcp_entry("dhcp1", "192.168.3.4")
-      dhcp_entry_info.should_not be_nil
-      JSON.parse(dhcp_entry_info)["id"].should match(/\w{8}-\w{4}-\w{4}-\w{4}-\w{12}/)
-    end
+  it "should create a new instance of dhcp" do
+    @messager.dhcp.should be_instance_of(Openstack::QuantumMessager::Dhcp)
+  end
 
+  it "should create a new instance of dhcp entry" do
+    @messager.dhcp_entry.should be_instance_of(Openstack::QuantumMessager::DhcpEntry)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstack-quantum-messager
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &12600300 !ruby/object:Gem::Requirement
+  requirement: &16042640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12600300
+  version_requirements: *16042640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12599320 !ruby/object:Gem::Requirement
+  requirement: &16042220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12599320
+  version_requirements: *16042220
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &12597680 !ruby/object:Gem::Requirement
+  requirement: &16041800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12597680
+  version_requirements: *16041800
 description: A simple gem to deal with openstack quantum
 email:
 - pothix@pothix.com
@@ -55,11 +55,27 @@ files:
 - ./spec/spec_helper.rb
 - ./spec/openstack_quantum_messager_spec.rb
 - ./spec/openstack-quantum-messager/l2l3_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/dhcp_entry_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/filtered_range_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/network_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/firewall_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/filter_rule_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/dhcp_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/port_spec.rb
+- ./spec/openstack-quantum-messager/l2l3/attachment_detail_spec.rb
 - ./Gemfile
 - ./Rakefile
 - ./lib/openstack-quantum-messager.rb
 - ./lib/openstack-quantum-messager/version.rb
 - ./lib/openstack-quantum-messager/l2l3.rb
+- ./lib/openstack-quantum-messager/l2l3/dhcp_entry.rb
+- ./lib/openstack-quantum-messager/l2l3/attachment_detail.rb
+- ./lib/openstack-quantum-messager/l2l3/firewall.rb
+- ./lib/openstack-quantum-messager/l2l3/network.rb
+- ./lib/openstack-quantum-messager/l2l3/filter_rule.rb
+- ./lib/openstack-quantum-messager/l2l3/filtered_range.rb
+- ./lib/openstack-quantum-messager/l2l3/port.rb
+- ./lib/openstack-quantum-messager/l2l3/dhcp.rb
 homepage: http://www.locaweb.com.br
 licenses: []
 post_install_message: