fauxhai 3.5.0 → 3.6.0

data/lib/fauxhai/platforms/windows/8.1.json

@@ -3462,43 +3462,108 @@
   },
   "macaddress": "11:11:11:11:11:11",
   "network": {
-    "default_gateway": "10.0.0.1",
-    "default_interface": "eth0",
-    "settings": {
-    },
     "interfaces": {
-      "eth0": {
+      "0xe": {
+        "configuration": {
+          "caption": "[00000012] Ethernet Adapter",
+          "database_path": "%SystemRoot%\\System32\\drivers\\etc",
+          "default_ip_gateway": [
+            "default_gateway"
+          ],
+          "description": "Ethernet Adapter",
+          "dhcp_enabled": false,
+          "dns_domain_suffix_search_order": [
+
+          ],
+          "dns_enabled_for_wins_resolution": false,
+          "dns_host_name": "Fauxhai",
+          "domain_dns_registration_enabled": false,
+          "full_dns_registration_enabled": true,
+          "gateway_cost_metric": [
+            0
+          ],
+          "index": 12,
+          "interface_index": 14,
+          "ip_address": [
+            "10.0.0.2"
+          ],
+          "ip_connection_metric": 5,
+          "ip_enabled": true,
+          "ip_filter_security_enabled": false,
+          "ip_sec_permit_ip_protocols": [
+
+          ],
+          "ip_sec_permit_tcp_ports": [
+
+          ],
+          "ip_sec_permit_udp_ports": [
+
+          ],
+          "ip_subnet": [
+            "255.255.255.0",
+            "64"
+          ],
+          "mac_address": "11:11:11:11:11:11",
+          "service_name": "netkvm",
+          "setting_id": "{00000000-0000-0000-0000-000000000000}",
+          "tcpip_netbios_options": 0,
+          "tcp_window_size": 64240,
+          "wins_enable_lm_hosts_lookup": true,
+          "wins_scope_id": ""
+        },
+        "instance": {
+          "adapter_type": "Ethernet 802.3",
+          "adapter_type_id": 0,
+          "availability": 3,
+          "caption": "[00000012] Ethernet Adapter",
+          "config_manager_error_code": 0,
+          "config_manager_user_config": false,
+          "creation_class_name": "Win32_NetworkAdapter",
+          "description": "Ethernet Adapter",
+          "device_id": "12",
+          "guid": "{00000000-0000-0000-0000-000000000000}",
+          "index": 12,
+          "installed": true,
+          "interface_index": 14,
+          "mac_address": "11:11:11:11:11:11",
+          "manufacturer": "",
+          "max_number_controlled": 0,
+          "name": "Ethernet Adapter",
+          "net_connection_id": "Ethernet",
+          "net_connection_status": 2,
+          "net_enabled": true,
+          "physical_adapter": true,
+          "pnp_device_id": "PCI\\VEN_0000&DEV_0000&SUBSYS_000000000&REV_00\\0&0000000000&00",
+          "power_management_supported": false,
+          "product_name": "Ethernet Adapter",
+          "service_name": "netkvm",
+          "speed": "10000000000",
+          "system_creation_class_name": "Win32_ComputerSystem",
+          "system_name": "Fauxhai",
+          "time_of_last_reset": "20000101000001.000000+000"
+        },
+        "counters": {
+        },
         "addresses": {
           "10.0.0.2": {
-            "broadcast": "10.0.0.255",
-            "family": "inet",
+            "prefixlen": "24",
             "netmask": "255.255.255.0",
-            "prefixlen": "23",
-            "scope": "Global"
+            "broadcast": "10.0.0.255",
+            "family": "inet"
+          },
+          "11:11:11:11:11:11": {
+            "family": "lladdr"
           }
         },
+        "type": "Ethernet 802.3",
         "arp": {
           "10.0.0.1": "fe:ff:ff:ff:ff:ff"
         },
-        "encapsulation": "Ethernet",
-        "flags": [
-          "BROADCAST",
-          "MULTICAST",
-          "UP",
-          "LOWER_UP"
-        ],
-        "mtu": "1500",
-        "number": "0",
-        "routes": {
-          "10.0.0.0/255": {
-            "scope": "link",
-            "src": "10.0.0.2"
-          }
-        },
-        "state": "up",
-        "type": "eth"
+        "encapsulation": "Ethernet"
       }
-    }
+    },
+    "default_gateway": "10.0.0.1",
+    "default_interface": "0xe"
   },
   "uptime": "30 days 15 hours 07 minutes 30 seconds",
   "uptime_seconds": 2646450,

data/lib/fauxhai/platforms/windows/8.json

@@ -3876,43 +3876,108 @@
   },
   "macaddress": "11:11:11:11:11:11",
   "network": {
-    "default_gateway": "10.0.0.1",
-    "default_interface": "eth0",
-    "settings": {
-    },
     "interfaces": {
-      "eth0": {
+      "0xe": {
+        "configuration": {
+          "caption": "[00000012] Ethernet Adapter",
+          "database_path": "%SystemRoot%\\System32\\drivers\\etc",
+          "default_ip_gateway": [
+            "default_gateway"
+          ],
+          "description": "Ethernet Adapter",
+          "dhcp_enabled": false,
+          "dns_domain_suffix_search_order": [
+
+          ],
+          "dns_enabled_for_wins_resolution": false,
+          "dns_host_name": "Fauxhai",
+          "domain_dns_registration_enabled": false,
+          "full_dns_registration_enabled": true,
+          "gateway_cost_metric": [
+            0
+          ],
+          "index": 12,
+          "interface_index": 14,
+          "ip_address": [
+            "10.0.0.2"
+          ],
+          "ip_connection_metric": 5,
+          "ip_enabled": true,
+          "ip_filter_security_enabled": false,
+          "ip_sec_permit_ip_protocols": [
+
+          ],
+          "ip_sec_permit_tcp_ports": [
+
+          ],
+          "ip_sec_permit_udp_ports": [
+
+          ],
+          "ip_subnet": [
+            "255.255.255.0",
+            "64"
+          ],
+          "mac_address": "11:11:11:11:11:11",
+          "service_name": "netkvm",
+          "setting_id": "{00000000-0000-0000-0000-000000000000}",
+          "tcpip_netbios_options": 0,
+          "tcp_window_size": 64240,
+          "wins_enable_lm_hosts_lookup": true,
+          "wins_scope_id": ""
+        },
+        "instance": {
+          "adapter_type": "Ethernet 802.3",
+          "adapter_type_id": 0,
+          "availability": 3,
+          "caption": "[00000012] Ethernet Adapter",
+          "config_manager_error_code": 0,
+          "config_manager_user_config": false,
+          "creation_class_name": "Win32_NetworkAdapter",
+          "description": "Ethernet Adapter",
+          "device_id": "12",
+          "guid": "{00000000-0000-0000-0000-000000000000}",
+          "index": 12,
+          "installed": true,
+          "interface_index": 14,
+          "mac_address": "11:11:11:11:11:11",
+          "manufacturer": "",
+          "max_number_controlled": 0,
+          "name": "Ethernet Adapter",
+          "net_connection_id": "Ethernet",
+          "net_connection_status": 2,
+          "net_enabled": true,
+          "physical_adapter": true,
+          "pnp_device_id": "PCI\\VEN_0000&DEV_0000&SUBSYS_000000000&REV_00\\0&0000000000&00",
+          "power_management_supported": false,
+          "product_name": "Ethernet Adapter",
+          "service_name": "netkvm",
+          "speed": "10000000000",
+          "system_creation_class_name": "Win32_ComputerSystem",
+          "system_name": "Fauxhai",
+          "time_of_last_reset": "20000101000001.000000+000"
+        },
+        "counters": {
+        },
         "addresses": {
           "10.0.0.2": {
-            "broadcast": "10.0.0.255",
-            "family": "inet",
+            "prefixlen": "24",
             "netmask": "255.255.255.0",
-            "prefixlen": "23",
-            "scope": "Global"
+            "broadcast": "10.0.0.255",
+            "family": "inet"
+          },
+          "11:11:11:11:11:11": {
+            "family": "lladdr"
           }
         },
+        "type": "Ethernet 802.3",
         "arp": {
           "10.0.0.1": "fe:ff:ff:ff:ff:ff"
         },
-        "encapsulation": "Ethernet",
-        "flags": [
-          "BROADCAST",
-          "MULTICAST",
-          "UP",
-          "LOWER_UP"
-        ],
-        "mtu": "1500",
-        "number": "0",
-        "routes": {
-          "10.0.0.0/255": {
-            "scope": "link",
-            "src": "10.0.0.2"
-          }
-        },
-        "state": "up",
-        "type": "eth"
+        "encapsulation": "Ethernet"
       }
-    }
+    },
+    "default_gateway": "10.0.0.1",
+    "default_interface": "0xe"
   },
   "uptime": "30 days 15 hours 07 minutes 30 seconds",
   "uptime_seconds": 2646450,

data/lib/fauxhai/runner.rb

@@ -7,6 +7,15 @@ module Fauxhai
       @system = Ohai::System.new
       @system.all_plugins
 
+      case @system.data['platform']
+      when 'windows', :windows
+        require 'fauxhai/runner/windows'
+        self.singleton_class.send :include, ::Fauxhai::Runner::Windows
+      else
+        require 'fauxhai/runner/default'
+        self.singleton_class.send :include, ::Fauxhai::Runner::Default
+      end
+
       result = @system.data.dup.delete_if { |k, v| !whitelist_attributes.include?(k) }.merge(
         'languages' => languages,
         'chef_packages' => chef_packages,
@@ -29,239 +38,5 @@ module Fauxhai
 
       puts JSON.pretty_generate(result)
     end
-
-    private
-
-    def bin_dir
-      '/usr/local/bin'
-    end
-
-    def chef_packages
-      return {} if @system.data['chef_packages'].nil?
-
-      chef_version = @system.data['chef_packages']['chef']['version']
-      ohai_version = @system.data['chef_packages']['ohai']['version']
-
-      {
-        'chef' => {
-          'version' => chef_version,
-          'chef_root' => ['/opt/chef/embedded/lib/ruby/gems/2.1.0/gems', "chef-#{chef_version}", 'lib'].join('/')
-        },
-        'ohai' => {
-          'version' => ohai_version,
-          'ohai_root' => ['/opt/chef/embedded/lib/ruby/gems/2.1.0/gems', "ohai-#{ohai_version}", 'lib', 'ohai'].join('/')
-        }
-      }
-    end
-
-    def counters
-      {
-        'network' => {
-          'interfaces' => {
-            'eth0' => {
-              'rx' => {
-                'bytes' => '0',
-                'packets' => '0',
-                'errors' => '0',
-                'drop' => 0,
-                'overrun' => 0,
-                'frame' => 0,
-                'compressed' => 0,
-                'multicast' => 0
-              },
-              'tx' => {
-                'bytes' => '342',
-                'packets' => '0',
-                'errors' => '0',
-                'drop' => 0,
-                'overrun' => 0,
-                'collisions' => '0',
-                'carrier' => 0,
-                'compressed' => 0
-              }
-            }
-          }
-        }
-      }
-    end
-
-    def current_user
-      'fauxhai'
-    end
-
-    def default_gateway
-      '10.0.0.1'
-    end
-
-    def default_interface
-      'eth0'
-    end
-
-    def domain
-      'local'
-    end
-
-    def etc
-      {
-        'passwd' => {
-          'fauxhai' => {
-            'dir' => '/home/fauxhai',
-            'gid' => 0,
-            'uid' => 0,
-            'shell' => '/bin/bash',
-            'gecos' => 'Fauxhai'
-          }
-        },
-        'group' => {
-          'fauxhai' => {
-            'gid' => 0,
-            'members' => [
-              'fauxhai'
-            ]
-          }
-        }
-      }
-    end
-
-    def fqdn
-      'fauxhai.local'
-    end
-
-    def gem_bin
-      '/usr/local/bin/gem'
-    end
-
-    def gems_dir
-      '/usr/local/gems'
-    end
-
-    def hostname
-      'Fauxhai'
-    end
-
-    def ipaddress
-      '10.0.0.2'
-    end
-
-    def ip6address
-      'fe80:0:0:0:0:0:a00:2'
-    end
-
-    def keys
-      {
-        'ssh' => ssh
-      }
-    end
-
-    def languages
-      {
-        'ruby' => @system.data['languages']['ruby'].merge('bin_dir' => bin_dir,
-                                                          'gem_bin' => gem_bin,
-                                                          'gems_dir' => gems_dir,
-                                                          'ruby_bin' => ruby_bin),
-        'powershell' => @system.data['languages']['powershell']
-      }
-    end
-
-    def macaddress
-      '11:11:11:11:11:11'
-    end
-
-    def network
-      {
-        'default_gateway' => default_gateway,
-        'default_interface' => default_interface,
-        'settings' => {},
-        'interfaces' => {
-          'eth0' => {
-            'addresses' => {
-              '10.0.0.2' => {
-                'broadcast' => '10.0.0.255',
-                'family' => 'inet',
-                'netmask' => '255.255.255.0',
-                'prefixlen' => '23',
-                'scope' => 'Global'
-              }
-            },
-            'arp' => {
-              '10.0.0.1' => 'fe:ff:ff:ff:ff:ff'
-            },
-            'encapsulation' => 'Ethernet',
-            'flags' => %w(BROADCAST MULTICAST UP LOWER_UP),
-            'mtu' => '1500',
-            'number' => '0',
-            'routes' => {
-              '10.0.0.0/255' => {
-                'scope' => 'link',
-                'src' => '10.0.0.2'
-              }
-            },
-            'state' => 'up',
-            'type' => 'eth'
-          }
-        }
-      }
-    end
-
-    def ruby_bin
-      '/usr/local/bin/ruby'
-    end
-
-    def ssh
-      {
-        'host_dsa_public' => File.read( File.join(Fauxhai.root, 'lib', 'fauxhai', 'keys', 'id_dsa.pub') ).strip,
-        'host_rsa_public' => File.read( File.join(Fauxhai.root, 'lib', 'fauxhai', 'keys', 'id_rsa.pub') ).strip
-      }
-    end
-
-    def uptime
-      '30 days 15 hours 07 minutes 30 seconds'
-    end
-
-    def uptime_seconds
-      2646450
-    end
-
-    def cpu
-      {
-        'real' => 1,
-        'total' => 1,
-        'cores' => 1
-      }
-    end
-
-    def memory
-      {
-        'total' => '1048576kB'
-      }
-    end
-
-    def virtualization
-      {
-        'systems' => {}
-      }
-    end
-
-    # Whitelist attributes are attributes that we *actually* want from the node. Other attributes are
-    # either ignored or overridden, but we ensure these are returned with the command.
-    #
-    # @return [Array] - the key of whitelisted attributes
-    def whitelist_attributes
-      %w(
-        command
-        dmi
-        filesystem
-        kernel
-        lsb
-        ohai_time
-        os
-        os_version
-        platform
-        platform_version
-        platform_build
-        platform_family
-        init_package
-        root_group)
-    end
   end
 end