networkmanager-dbus 0.0.1 → 0.1.0

data/lib/network_manager/dbus/settings_connection.rb

@@ -1,4 +1,90 @@
 class NetworkManager::DBus::SettingsConnection
+  class SecretsCacheInvalidError < StandardError; end
+  
+  HW_TYPE_ETHERNET = '802-3-ethernet'
+  HW_TYPE_WIRELESS = '802-11-wireless'
+  HW_TYPE_BLUETOOTH = 'bluetooth'
+  SW_TYPE_VPN = 'vpn'
+  SW_TYPE_BRIDGE = 'bridge'
+  
   include DBusInterface::Object
+  no_properties!
   map_dbus :default_iface => 'org.freedesktop.NetworkManager.Settings.Connection'
+  
+  def settings
+    call('GetSettings').first
+  end
+  
+  def delete
+    call('Delete')
+  end
+  
+  def secrets(name = '')
+    call('GetSecrets', name)
+  rescue DBus::Error => e
+    raise SecretsCacheInvalidError.new("Secrets cache invalid (#{e})")
+  end
+  
+  def name
+    settings['connection']['id']
+  end
+  
+  def uuid
+    settings['connection']['uuid']
+  end
+  
+  def type
+    settings['connection']['type']
+  end
+  
+  def update(hash)
+    new_settings = hash.dup
+    unless new_settings.has_key? 'connection'
+      new_settings.merge!(settings)
+    end
+    call('Update', new_settings)
+  end
+  
+  def name=(new_id)
+    hash = settings
+    hash['connection']['id'] = new_id
+    hash.delete 'ipv4'
+    update(hash)
+  end
+  
+  IPV4_METHOD_AUTO = 'auto'
+  IPV4_METHOD_MANUAL = 'manual'
+  
+  def ip4=(ip4)
+    hash = settings
+    hash['ipv4'] = ip4
+    update(hash)
+  end
+  
+  def ip4_auto!
+    self.ip4 = {'method' => IPV4_METHOD_AUTO}
+  end
+  
+  def ip4_manual=(addresses)
+    # ensure wrapper array
+    addresses = [addresses] unless addresses.is_a? Array
+    
+    self.ip4 = {
+      'method' => IPV4_METHOD_MANUAL,
+      'addresses' => ['aau', addresses.map{|a| a.to_nm_au}]
+    }
+  end
+  
+  def ip4
+    if ipv4 = settings['ipv4']
+      if ipv4['method'] == IPV4_METHOD_MANUAL
+        address = ipv4['addresses'].first
+        NetworkManager::Ip4Config.from_nm_au *address
+      else
+        IPV4_METHOD_AUTO
+      end
+    else
+      nil
+    end
+  end
 end

data/lib/network_manager/ip4_config.rb

@@ -0,0 +1,33 @@
+class NetworkManager::Ip4Config
+  attr_accessor :address, :gateway
+  
+  def self.from_dot_notation(address, subnet = '255.255.255.0', gateway = '0.0.0.0')
+    obj = self.new
+    obj.address = IPAddress::IPv4.new(address)
+    obj.address.netmask = subnet
+    obj.gateway = IPAddress::IPv4.new(gateway)
+    obj.gateway.netmask = subnet
+    obj
+  end
+  
+  def self.from_nm_au(address_u32, prefix = 0, gateway_u32 = 0)
+    obj = self.new
+    obj.address = revert_octects(IPAddress::IPv4.parse_u32(address_u32))
+    obj.address.prefix = prefix
+    obj.gateway = revert_octects(IPAddress::IPv4.parse_u32(gateway_u32))
+    obj.gateway.prefix = prefix
+    obj
+  end
+  
+  def to_nm_au
+    [revert_octects(address).to_i, address.prefix.to_i, revert_octects(gateway).to_i]
+  end
+  
+  def self.revert_octects(ipv4)
+    IPAddress::IPv4.new(ipv4.octets.reverse.join('.'))
+  end
+  
+  def revert_octects(ipv4)
+    self.class.revert_octects(ipv4)
+  end
+end

data/lib/network_manager/version.rb

@@ -1,3 +1,3 @@
 module NetworkManager
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/networkmanager-dbus.rb

@@ -1 +1 @@
-require "network_manager"
+require File.join(File.dirname(__FILE__), "network_manager")

data/networkmanager-dbus.gemspec

@@ -20,11 +20,15 @@ Gem::Specification.new do |s|
 
   # dependencies
   s.add_development_dependency "rake"
+  s.add_development_dependency "pry"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rr"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-shell"
+  s.add_development_dependency "growl-rspec"
   s.add_development_dependency "growl"
   s.add_development_dependency "json"
   s.add_development_dependency "marilyn-rpc"
+  s.add_runtime_dependency 'ipaddress'
   s.add_runtime_dependency "ruby-dbus"
 end

data/script/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+project_dir = File.expand_path(File.dirname(__FILE__))
+require File.join(project_dir, '../lib/networkmanager-dbus')
+require 'pry'
+
+Pry.start

data/script/spec_server

@@ -8,6 +8,7 @@ class RSpecRunner < MarilynRPC::Service
   register :rspec
 
   def run()
+    ENV['RSPEC_FORMAT'] = 'remote'
     `rspec`
   end
 end

data/spec/fixtures/active_connections.yml

@@ -0,0 +1,10 @@
+"/org/freedesktop/NetworkManager/ActiveConnection/0":
+  properties:
+    "Connection": "/org/freedesktop/NetworkManager/Settings/0"
+    "SpecificObject": "/"
+    "Uuid": "f6ea104f-48aa-4925-b4c7-4e7ae561099c"
+    "Devices": ["/org/freedesktop/NetworkManager/Devices/0"]
+    "State": 2
+    "Default": no
+    "Default6": no
+    "Vpn": no

data/spec/fixtures/devices.yml

@@ -1,4 +1,4 @@
-0:
+"/org/freedesktop/NetworkManager/Device/0":
   properties:
     "Interface": "eth0"
     "Ip4Address": 1698212032
@@ -22,39 +22,20 @@
       "PermHwAddress": "08:00:27:FB:3B:10"
       "Speed": 1000
       "Carrier": yes
-  ip4_config:
-    0:
-      properties:
-        "Addresses": [ [1698212032, 24, 0] ]
-        "Nameservers": []
-        "WinsServers": []
-        "Domains": []
-        "Routes": []
-  dhcp4_config:
-    properties:
-      "Options":
-        "4163": "4163"
-        "1500": "1500"
-        "subnet_cidr": "24"
-        "broadcast_address": "192.168.56.255"
-        "dhcp_message_type": "5"
-        "eth0": "eth0"
-        "dhcp_lease_time": "3600"
-        "ip_address": "192.168.56.101"
-        "subnet_mask": "255.255.255.0"
-        "0": "0"
-        "202": "202"
-        "lookup-hostname": "lookup-hostname"
-        "network_number": "192.168.56.0"
-        "dhcp_server_identifier": "192.168.56.100"
-  active_connection:
-    properties:
-      "Connection": "/org/freedesktop/NetworkManager/Settings/0"
-      "SpecificObject": "/"
-      "Uuid": "9bd14d22-6da6-45d0-b68a-596c3c3297c2"
-      "Devices": ["/org/freedesktop/NetworkManager/Devices/0"]
-      "State": 2
-      "Default": no
-      "Default6": no
-      "Vpn": no 
-        
+"/org/freedesktop/NetworkManager/Device/1":
+  properties:
+     "Udi": "/sys/devices/pci0000:00/0000:00:03.0/net/eth1"
+     "Interface": "eth1"
+     "IpInterface": ""
+     "Driver": "e1000"
+     "Capabilities": 3
+     "Ip4Address": 0
+     "State": 30
+     "ActiveConnection": "/"
+     "Ip4Config": "/"
+     "Dhcp4Config": "/"
+     "Ip6Config": "/"
+     "Dhcp6Config": "/"
+     "Managed": yes
+     "FirmwareMissing": no
+     "DeviceType": 1

data/spec/fixtures/dhcp4_configs.yml

@@ -0,0 +1,17 @@
+"/org/freedesktop/NetworkManager/DHCP4Config/0":
+  properties:
+    "Options":
+      "4163": "4163"
+      "1500": "1500"
+      "subnet_cidr": "24"
+      "broadcast_address": "192.168.56.255"
+      "dhcp_message_type": "5"
+      "eth0": "eth0"
+      "dhcp_lease_time": "3600"
+      "ip_address": "192.168.56.101"
+      "subnet_mask": "255.255.255.0"
+      "0": "0"
+      "202": "202"
+      "lookup-hostname": "lookup-hostname"
+      "network_number": "192.168.56.0"
+      "dhcp_server_identifier": "192.168.56.100"

data/spec/fixtures/ip4_configs.yml

@@ -0,0 +1,7 @@
+"/org/freedesktop/NetworkManager/IP4Config/1":
+  properties:
+    "Addresses": [ [1698212032, 24, 0] ]
+    "Nameservers": []
+    "WinsServers": []
+    "Domains": []
+    "Routes": []

data/spec/fixtures/settings.yml

@@ -1,14 +1,4 @@
-properties:
-  Hostname: 'dev-vm'
-  CanModify: yes
-connections:
-  -
-    settings:
-      "connection":
-        "id": "Wired connection 1"
-        "uuid": "6190ee1e-c5c5-41f5-8de3-500d229970f9"
-        "timestamp": "1320083832"
-        "type": "802-3-ethernet"
-      "802-3-ethernet":
-        "s390-options": {}
-        "mac-address": [8, 0, 39, 251, 59, 16]
+"/org/freedesktop/NetworkManager/Settings":
+  properties:
+    Hostname: 'dev-vm'
+    CanModify: yes

data/spec/fixtures/settings_connections.yml

@@ -0,0 +1,10 @@
+"/org/freedesktop/NetworkManager/SettingsConnection/0":
+  settings:
+    "connection":
+      "id": "Wired connection 1"
+      "uuid": "6190ee1e-c5c5-41f5-8de3-500d229970f9"
+      "timestamp": "1320083832"
+      "type": "802-3-ethernet"
+    "802-3-ethernet":
+      "s390-options": {}
+      "mac-address": [8, 0, 39, 251, 59, 16]

data/spec/lib/dbus_interface/class_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe "DBusInterface::Class" do
+  
+  it 'should map_dbus :default_iface' do
+    module AWorkingDummyInterface
+      extend ::DBusInterface::Class
+      map_dbus :default_iface => 'foo.bar', :object_path => 'foo/bar'
+    end
+    AWorkingDummyInterface.default_iface.should == 'foo.bar'
+    AWorkingDummyInterface.object_path.should == 'foo/bar'
+  end
+  
+  it 'should raise if map_dbus lacks :default_iface' do
+    lambda do
+      module ABrokenDummyInterface
+        extend ::DBusInterface::Class
+        map_dbus :foo => 'bar'
+      end
+    end.should raise_error(ArgumentError, 'map_dbus must specify at least :default_iface')
+  end
+  
+  it 'should raise if map_dbus lacks :default_iface' do
+    lambda do
+      module ABrokenDummyInterface
+        extend ::DBusInterface::Class
+        map_dbus 123
+      end
+    end.should raise_error(ArgumentError, 'map_dbus must receive a Hash instead of Fixnum')
+  end
+end

data/spec/lib/dbus_interface/object_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe "DBusInterface::Object" do
+  
+  it 'should use default object_path' do
+    class ADummyObject
+      include ::DBusInterface::Object
+      map_dbus :default_iface => 'foo.bar', :object_path => 'foo/bar'
+    end
+    ADummyObject.new.object_path.should == 'foo/bar'
+  end
+  
+  it 'should use overwrite object_path' do
+    class ADummyObject
+      include ::DBusInterface::Object
+      map_dbus :default_iface => 'foo.bar', :object_path => 'foo/bar'
+    end
+    ADummyObject.new('boo/laa').object_path.should == 'boo/laa'
+  end
+  
+  it 'should return nil if call is on empty object path' do
+    dbus_interface_mock
+    class ADummyObject
+      include ::DBusInterface::Object
+      map_dbus :default_iface => 'foo.bar', :object_path => 'foo/bar'
+    end
+    
+    pending 'needs better mocking here'
+    ADummyObject.new('/').properties.should be_nil
+    ADummyObject.new(nil).properties.should be_nil
+  end
+end

data/spec/{network_manager → lib/network_manager}/dbus/active_connection_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe "NetworkManager::DBus::ActiveConnection" do
   before :each do
-    @devices = fixture('devices.yml')
-    @device = @devices[0]
-    @config = @device['active_connection']
+    @data = fixture('active_connections.yml')
+    @object_paths = object_paths_from_fixture('active_connections.yml')
   end
-  
+
   it 'should map interface "org.freedesktop.NetworkManager.Connection.Active"' do
     NetworkManager::DBus::ActiveConnection.default_iface.should ==
       'org.freedesktop.NetworkManager.Connection.Active'
   end
   
   it 'shoud list properties' do
-    config = NetworkManager::DBus::ActiveConnection.new @device['properties']['ActiveConnection']
-    config.properties.should == @config['properties']
+    network_manager_dbus_mock
+    con = NetworkManager::DBus::ActiveConnection.new @object_paths.first
+    con.properties.should == @data.first.last['properties']
   end
 end

data/spec/lib/network_manager/dbus/device_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "NetworkManager::DBus::Device" do
+  before :each do
+    @devices = fixture('devices.yml')
+    @object_paths = object_paths_from_fixture('devices.yml')
+  end
+  
+  describe "NM_DEVICE_TYPE" do
+    before :each do
+      network_manager_dbus_mock
+      @nm_device_type = NetworkManager::DBus::Device::NM_DEVICE_TYPE__PROPERTY
+      @device = NetworkManager::DBus::Device.new @object_paths.first
+    end
+    
+    describe "NM_DEVICE_TYPE_ETHERNET" do
+      it "should detect ethernet devices with NM_DEVICE_TYPE_ETHERNET" do
+        @device.properties[@nm_device_type] =
+          NetworkManager::DBus::Device::NM_DEVICE_TYPE_ETHERNET
+        @device.ethernet?.should == true
+      end
+      
+      it "should not detect ethernet devices withour NM_DEVICE_TYPE_ETHERNET" do
+        @device.properties[@nm_device_type] = 1234567
+        @device.ethernet?.should == false
+      end
+      
+      it "should instantiate ethernet devices" do
+        @device.properties[@nm_device_type] =
+          NetworkManager::DBus::Device::NM_DEVICE_TYPE_ETHERNET
+        @device.ethernet.class.should == NetworkManager::DBus::EthernetDevice
+      end
+      
+      it "should not instantiate unknown device types" do
+        @device.properties[@nm_device_type] = 12345123
+        @device.ethernet.should == nil
+      end
+    end
+  end
+  
+  it "should provide ip4_address" do
+    network_manager_dbus_mock
+    device = NetworkManager::DBus::Device.new @object_paths.first
+    device.ip4_address.to_s.should == '192.168.56.101'
+  end
+  
+  it 'should provide ip4_config' do
+    network_manager_dbus_mock
+    device = NetworkManager::DBus::Device.new @object_paths.first
+    device.ip4_config.class.should == NetworkManager::DBus::Ip4Config
+  end
+  
+  it 'should provide active_connection' do
+    network_manager_dbus_mock
+    device = NetworkManager::DBus::Device.new @object_paths.first
+    device.active_connection.class.should == NetworkManager::DBus::ActiveConnection
+  end
+end