Merge branch 'dev' of github.com:AndreasAakesson/IncludeOS into dev

Author: fwsGonzo

examples/websocket/config.json

@@ -1,5 +1,13 @@
 {
   "net": [
-    ["10.0.0.42", "255.255.255.0", "10.0.0.1"]
+    {
+      "iface": 0,
+      "config":  "static",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
   ]
 }
+
+

src/net/configure.cpp

@@ -29,24 +29,17 @@ using Addresses = std::vector<ip4::Addr>;
 template <typename T>
 Addresses parse_iface(T& obj)
 {
-  Expects(obj.IsArray());
+  Expects(obj.HasMember("address"));
+  Expects(obj.HasMember("netmask"));
+  Expects(obj.HasMember("gateway"));
 
-  // Iface can either be empty: [] or contain 3 to 4 IP's (see Inet static config)
-  if(not obj.Empty())
-  {
-    Expects(obj.Size() >= 3 and obj.Size() <= 4);
-
-    Addresses addresses;
-
-    for(auto& addr : obj.GetArray())
-    {
-      addresses.emplace_back(std::string{addr.GetString()});
-    }
-
-    return addresses;
-  }
+  ip4::Addr address{obj["address"].GetString()};
+  ip4::Addr netmask{obj["netmask"].GetString()};
+  ip4::Addr gateway{obj["gateway"].GetString()};
+  ip4::Addr dns = (not obj.HasMember("dns")) ? gateway : ip4::Addr{obj["dns"].GetString()};
 
-  return {};
+  Addresses addresses{address, netmask, gateway, dns};
+  return addresses;
 }
 
 inline void config_stack(Inet<IP4>& stack, const Addresses& addrs)
@@ -69,23 +62,45 @@ void configure(const rapidjson::Value& net)
 
   Expects(net.IsArray() && "Member net is not an array");
 
-  int N = 0;
-  for(auto& val : net.GetArray())
+  auto configs = net.GetArray();
+  if(configs.Size() > Super_stack::inet().ip4_stacks().size())
+    MYINFO("! WARNING: Found more configs than there are interfaces");
+  // Iterate all interfaces in config
+  for(auto& val : configs)
   {
-    if(N >= static_cast<int>(Super_stack::inet().ip4_stacks().size()))
-      break;
+    Expects(val.HasMember("iface")
+      && "Missing member iface - don't know which interface to configure");
+
+    auto N = val["iface"].GetInt();
 
     auto& stack = Super_stack::get<IP4>(N);
-    // static configs
-    if(val.IsArray())
+
+    // if config is not set, just ignore
+    if(not val.HasMember("config"))
+      continue;
+
+    std::string method = val["config"].GetString();
+
+    if(method == "dhcp")
+    {
+      stack.negotiate_dhcp(5.0);
+    }
+    else if(method == "static")
     {
       config_stack(stack, parse_iface(val));
     }
-    else if(val.IsString() and strcmp(val.GetString(), "dhcp") == 0)
+    else if(method == "dhcp-with-fallback")
     {
-      stack.negotiate_dhcp(5.0);
+      auto addresses = parse_iface(val);
+      auto static_cfg = [addresses, &stack] (bool timeout)
+      {
+        if(timeout) {
+          MYINFO("DHCP timeout (%s) - falling back to static configuration", stack.ifname().c_str());
+          config_stack(stack, addresses);
+        }
+      };
+      stack.negotiate_dhcp(5.0, static_cfg);
     }
-    ++N;
   }
 
   MYINFO("Configuration complete");

test/net/integration/configure/config.json

@@ -1,8 +1,34 @@
 {
   "net": [
-    ["10.0.0.42", "255.255.255.0", "10.0.0.1"],
-    ["10.0.0.43", "255.255.255.0", "10.0.0.1", "8.8.8.8"],
-    "none",
-    "dhcp"
+    {
+      "iface": 0,
+      "config":  "static",
+      "address": "10.0.0.42",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    },
+    {
+      "iface": 1,
+      "config":  "static",
+      "address": "10.0.0.43",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1",
+      "dns":     "8.8.8.8"
+    },
+    {
+      "iface": 2,
+      "config": "none"
+    },
+    {
+      "iface": 3,
+      "config": "dhcp"
+    },
+    {
+      "iface": 5,
+      "config": "dhcp-with-fallback",
+      "address": "10.0.0.44",
+      "netmask": "255.255.255.0",
+      "gateway": "10.0.0.1"
+    }
   ]
 }

test/net/integration/configure/service.cpp

@@ -16,7 +16,6 @@
 // limitations under the License.
 
 #include <service>
-#include <net/configure.hpp>
 #include <net/super_stack.hpp>
 #include <config>
 
@@ -25,14 +24,7 @@ void Service::start()
   using namespace net;
 
   auto& stacks = Super_stack::inet().ip4_stacks();
-  CHECKSERT(stacks.size() == 5, "There is 5 interfaces");
-
-  const auto& cfg = Config::get();
-  using namespace rapidjson;
-  Document doc;
-  doc.Parse(cfg.data());
-
-  net::configure(doc["net"]);
+  CHECKSERT(stacks.size() == 6, "There are 6 interfaces");
 
   INFO("Test", "Verify eth0");
   CHECKSERT(stacks[0] != nullptr, "eth0 is initialized");
@@ -56,7 +48,7 @@ void Service::start()
   CHECKSERT(stacks[2] != nullptr, "eth2 is initialized");
 
   auto& eth2 = *stacks[2];
-  const ip4::Addr EMPTY{0};
+  static const ip4::Addr EMPTY{0};
   CHECKSERT(eth2.ip_addr() == EMPTY, "IP address is 0.0.0.0");
   CHECKSERT(eth2.netmask() == EMPTY, "Netmask is 0.0.0.0");
   CHECKSERT(eth2.gateway() == EMPTY, "Gateway is 0.0.0.0");
@@ -68,5 +60,15 @@ void Service::start()
   INFO("Test", "Verify eth4");
   CHECKSERT(stacks[4] == nullptr, "eth4 is uninitialized");
 
-  printf("SUCCESS\n");
+  auto& eth5 = *stacks[5];
+  auto verify_eth5 = [](auto& eth5) {
+    INFO("Test", "Verify eth5");
+    CHECKSERT(eth5.ip_addr() != EMPTY, "IP not empty (%s)", eth5.ip_addr().str().c_str());
+    CHECKSERT(eth5.netmask() != EMPTY, "Netmask  not empty (%s)", eth5.netmask().str().c_str());
+    CHECKSERT(eth5.gateway() != EMPTY, "Gateway  not empty (%s)", eth5.gateway().str().c_str());
+    CHECKSERT(eth5.dns_addr() != EMPTY, "DNS addr not empty (%s)", eth5.dns_addr().str().c_str());
+    printf("SUCCESS\n");
+  };
+  eth5.on_config(verify_eth5);
+
 }

test/net/integration/configure/vm.json

@@ -5,7 +5,8 @@
     {"device" : "virtio", "mac" : "c0:01:0a:00:00:3a"},
     {"device" : "virtio", "mac" : "c0:01:0a:00:00:4a"},
     {"device" : "virtio", "mac" : "c0:01:0a:00:00:5a"},
-    {"device" : "virtio", "mac" : "c0:01:0a:00:00:6a"}
+    {"device" : "virtio", "mac" : "c0:01:0a:00:00:6a"},
+    {"device" : "virtio", "mac" : "c0:01:0a:00:00:7a"}
   ],
   "mem"   : 256
 }