X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e3713a4134fbde069fa0e4e2a66b7fd1040da169..7d3d8c0086ff6a566175b8c22d1268ebde887e80:/src/kernel/routing/StarZone_test.cpp

diff --git a/src/kernel/routing/StarZone_test.cpp b/src/kernel/routing/StarZone_test.cpp
index ef8fb3d823..d8d5206235 100644
--- a/src/kernel/routing/StarZone_test.cpp
+++ b/src/kernel/routing/StarZone_test.cpp
@@ -11,49 +11,90 @@
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "src/surf/network_interface.hpp"
-#include "src/surf/surf_interface.hpp"    // create models
-#include "src/surf/xml/platf_private.hpp" // RouteCreationArgs and friends
 
 TEST_CASE("kernel::routing::StarZone: Creating Zone", "[creation]")
 {
-  int argc           = 1;
-  const char* argv[] = {"test"};
-
-  simgrid::s4u::Engine e(&argc, const_cast<char**>(argv));
+  simgrid::s4u::Engine e("test");
 
   REQUIRE(simgrid::s4u::create_star_zone("test"));
 }
 
-// One day we may be able to test contracts and asserts with catch2
-// https://github.com/catchorg/Catch2/issues/853
-TEST_CASE("kernel::routing::StarZone: Adding routes: assert", "[.][assert]")
+TEST_CASE("kernel::routing::StarZone: Adding routes (hosts): exception", "")
 {
-  int argc           = 1;
-  const char* argv[] = {"test"};
-  simgrid::s4u::Engine e(&argc, const_cast<char**>(argv));
+  simgrid::s4u::Engine e("test");
   auto* zone      = new simgrid::kernel::routing::StarZone("test");
   auto* netpoint1 = new simgrid::kernel::routing::NetPoint("netpoint1", simgrid::kernel::routing::NetPoint::Type::Host);
   auto* netpoint2 = new simgrid::kernel::routing::NetPoint("netpoint2", simgrid::kernel::routing::NetPoint::Type::Host);
 
-  SECTION("Source and destination hosts: nullptr") { zone->add_route(nullptr, nullptr, nullptr, nullptr, {}, false); }
+  SECTION("src and dst: nullptr")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(nullptr, nullptr, nullptr, nullptr, {}, false), std::invalid_argument);
+  }
+
+  SECTION("src: nullptr and symmetrical: true")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(nullptr, netpoint2, nullptr, nullptr, {}, true), std::invalid_argument);
+  }
+
+  SECTION("src and dst: not nullptr")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(netpoint1, netpoint2, nullptr, nullptr, {}, false), std::invalid_argument);
+  }
+}
+
+TEST_CASE("kernel::routing::StarZone: Adding routes (netzones): exception", "")
+{
+  simgrid::s4u::Engine e("test");
+  auto* zone = new simgrid::kernel::routing::StarZone("test");
+  auto* netpoint1 =
+      new simgrid::kernel::routing::NetPoint("netpoint1", simgrid::kernel::routing::NetPoint::Type::NetZone);
+  auto* netpoint2 =
+      new simgrid::kernel::routing::NetPoint("netpoint2", simgrid::kernel::routing::NetPoint::Type::NetZone);
+  auto zone3      = std::make_unique<simgrid::kernel::routing::StarZone>("test3");
+  auto* netpoint3 = zone3->create_router("netpoint3");
+
+  SECTION("src: is a netzone and gw_src: nullptr")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(netpoint1, nullptr, nullptr, nullptr, {}, false), std::invalid_argument);
+  }
+
+  SECTION("src: is a netzone and gw_src: is a netzone")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(netpoint1, nullptr, netpoint2, nullptr, {}, false), std::invalid_argument);
+  }
+
+  SECTION("dst: is a netzone and gw_dst: nullptr")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(nullptr, netpoint2, nullptr, nullptr, {}, false), std::invalid_argument);
+  }
 
-  SECTION("Source nullptr and symmetrical true") { zone->add_route(nullptr, netpoint2, nullptr, nullptr, {}, true); }
+  SECTION("dst: is a netzone and gw_dst: is a netzone")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(nullptr, netpoint2, nullptr, netpoint1, {}, false), std::invalid_argument);
+  }
+
+  SECTION("issue71: gw_src isn't member of the src netzone")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(zone->get_netpoint(), nullptr, netpoint3, nullptr, {}, false),
+                      std::invalid_argument);
+  }
 
-  SECTION("Source and destination set") { zone->add_route(netpoint1, netpoint2, nullptr, nullptr, {}, false); }
+  SECTION("issue71: gw_dst isn't member of the dst netzone")
+  {
+    REQUIRE_THROWS_AS(zone->add_route(nullptr, zone->get_netpoint(), nullptr, netpoint3, {}, false),
+                      std::invalid_argument);
+  }
 }
 
+// One day we may be able to test contracts and asserts with catch2
+// https://github.com/catchorg/Catch2/issues/853
 TEST_CASE("kernel::routing::StarZone: Get routes: assert", "[.][assert]")
 {
-  /* workaround to initialize things, they must be done in this particular order */
-  int argc           = 1;
-  const char* argv[] = {"test"};
-  simgrid::s4u::Engine e(&argc, const_cast<char**>(argv));
+  simgrid::s4u::Engine e("test");
   auto* zone = new simgrid::kernel::routing::StarZone("test");
-  surf_network_model_init_LegrandVelho();
-  surf_cpu_model_init_Cas01();
 
-  auto* host1 = zone->create_host("netpoint1", {100});
-  auto* host2 = zone->create_host("netpoint2", {100});
+  const auto* host1 = zone->create_host("netpoint1", {100});
+  const auto* host2 = zone->create_host("netpoint2", {100});
   std::vector<simgrid::kernel::resource::LinkImpl*> links;
   links.push_back(zone->create_link("link1", {100})->get_impl());
   std::vector<simgrid::kernel::resource::LinkImpl*> links2;
@@ -64,7 +105,7 @@ TEST_CASE("kernel::routing::StarZone: Get routes: assert", "[.][assert]")
     zone->add_route(host1->get_netpoint(), nullptr, nullptr, nullptr, links, true);
     zone->add_route(nullptr, host2->get_netpoint(), nullptr, nullptr, links2, false);
     double lat;
-    simgrid::kernel::routing::RouteCreationArgs route;
+    simgrid::kernel::routing::Route route;
     zone->get_local_route(host2->get_netpoint(), host1->get_netpoint(), &route, &lat);
   }
 
@@ -73,16 +114,14 @@ TEST_CASE("kernel::routing::StarZone: Get routes: assert", "[.][assert]")
     zone->add_route(host1->get_netpoint(), nullptr, nullptr, nullptr, links, false);
     zone->add_route(host2->get_netpoint(), nullptr, nullptr, nullptr, links2, true);
     double lat;
-    simgrid::kernel::routing::RouteCreationArgs route;
+    simgrid::kernel::routing::Route route;
     zone->get_local_route(host2->get_netpoint(), host1->get_netpoint(), &route, &lat);
   }
 }
 
-TEST_CASE("kernel::routing::StarZone: Adding routes: valid", "")
+TEST_CASE("kernel::routing::StarZone: Adding routes (hosts): valid", "")
 {
-  int argc           = 1;
-  const char* argv[] = {"test"};
-  simgrid::s4u::Engine e(&argc, const_cast<char**>(argv));
+  simgrid::s4u::Engine e("test");
   auto* zone     = new simgrid::kernel::routing::StarZone("test");
   auto* netpoint = new simgrid::kernel::routing::NetPoint("netpoint1", simgrid::kernel::routing::NetPoint::Type::Host);
 
@@ -104,18 +143,25 @@ TEST_CASE("kernel::routing::StarZone: Adding routes: valid", "")
   SECTION("Source == destination") { zone->add_route(netpoint, netpoint, nullptr, nullptr, {}, false); }
 }
 
-TEST_CASE("kernel::routing::StarZone: Get routes", "")
+TEST_CASE("kernel::routing::StarZone: Adding routes (netzones): valid", "")
+{
+  simgrid::s4u::Engine e("test");
+  auto* zone     = new simgrid::kernel::routing::StarZone("test");
+  auto* netpoint = new simgrid::kernel::routing::NetPoint("netpoint1", simgrid::kernel::routing::NetPoint::Type::Host);
+  auto* gw       = new simgrid::kernel::routing::NetPoint("gw1", simgrid::kernel::routing::NetPoint::Type::Router);
+
+  SECTION("src: is a netzone, src_gw: is a router") { zone->add_route(netpoint, nullptr, gw, nullptr, {}, true); }
+
+  SECTION("dst: is a netzone, dst_gw: is a router") { zone->add_route(nullptr, netpoint, nullptr, gw, {}, false); }
+}
+
+TEST_CASE("kernel::routing::StarZone: Get routes (hosts)", "")
 {
-  /* workaround to initialize things, they must be done in this particular order */
-  int argc           = 1;
-  const char* argv[] = {"test"};
-  simgrid::s4u::Engine e(&argc, const_cast<char**>(argv));
+  simgrid::s4u::Engine e("test");
   auto* zone = new simgrid::kernel::routing::StarZone("test");
-  surf_network_model_init_LegrandVelho();
-  surf_cpu_model_init_Cas01();
 
-  auto* host1 = zone->create_host("netpoint1", {100});
-  auto* host2 = zone->create_host("netpoint2", {100});
+  const auto* host1 = zone->create_host("netpoint1", {100});
+  const auto* host2 = zone->create_host("netpoint2", {100});
 
   SECTION("Get route: no shared link")
   {
@@ -128,12 +174,14 @@ TEST_CASE("kernel::routing::StarZone: Get routes", "")
     zone->seal();
 
     double lat = 0.0;
-    simgrid::kernel::routing::RouteCreationArgs route;
+    simgrid::kernel::routing::Route route;
     zone->get_local_route(host1->get_netpoint(), host2->get_netpoint(), &route, &lat);
     REQUIRE(lat == 30);
-    REQUIRE(route.link_list.size() == 2);
-    REQUIRE(route.link_list[0]->get_name() == "link1");
-    REQUIRE(route.link_list[1]->get_name() == "link2");
+    REQUIRE(route.gw_src_ == nullptr);
+    REQUIRE(route.gw_dst_ == nullptr);
+    REQUIRE(route.link_list_.size() == 2);
+    REQUIRE(route.link_list_[0]->get_name() == "link1");
+    REQUIRE(route.link_list_[1]->get_name() == "link2");
   }
 
   SECTION("Get route: shared link(backbone)")
@@ -151,55 +199,80 @@ TEST_CASE("kernel::routing::StarZone: Get routes", "")
     zone->seal();
 
     double lat = 0.0;
-    simgrid::kernel::routing::RouteCreationArgs route;
+    simgrid::kernel::routing::Route route;
     zone->get_local_route(host1->get_netpoint(), host2->get_netpoint(), &route, &lat);
     REQUIRE(lat == 130);
-    REQUIRE(route.link_list.size() == 3);
-    REQUIRE(route.link_list[0]->get_name() == "link1");
-    REQUIRE(route.link_list[1]->get_name() == "backbone");
-    REQUIRE(route.link_list[2]->get_name() == "link2");
+    REQUIRE(route.link_list_.size() == 3);
+    REQUIRE(route.link_list_[0]->get_name() == "link1");
+    REQUIRE(route.link_list_[1]->get_name() == "backbone");
+    REQUIRE(route.link_list_[2]->get_name() == "link2");
   }
 
-  SECTION("Get route: shared link(backbone)")
+  SECTION("Get route: loopback")
   {
     auto* backbone = zone->create_link("backbone", {1000})->set_latency(100)->get_impl();
     std::vector<simgrid::kernel::resource::LinkImpl*> links;
     links.push_back(zone->create_link("link1", {100})->set_latency(10)->get_impl());
     links.push_back(backbone);
-    std::vector<simgrid::kernel::resource::LinkImpl*> links2;
-    links2.push_back(zone->create_link("link2", {200})->set_latency(20)->get_impl());
-    links2.push_back(backbone);
 
-    zone->add_route(host1->get_netpoint(), nullptr, nullptr, nullptr, links, true);
-    zone->add_route(host2->get_netpoint(), nullptr, nullptr, nullptr, links2, true);
+    zone->add_route(host1->get_netpoint(), host1->get_netpoint(), nullptr, nullptr, links, true);
     zone->seal();
 
     double lat = 0.0;
-    simgrid::kernel::routing::RouteCreationArgs route;
-    zone->get_local_route(host1->get_netpoint(), host2->get_netpoint(), &route, &lat);
-    REQUIRE(lat == 130);
-    REQUIRE(route.link_list.size() == 3);
-    REQUIRE(route.link_list[0]->get_name() == "link1");
-    REQUIRE(route.link_list[1]->get_name() == "backbone");
-    REQUIRE(route.link_list[2]->get_name() == "link2");
+    simgrid::kernel::routing::Route route;
+    zone->get_local_route(host1->get_netpoint(), host1->get_netpoint(), &route, &lat);
+    REQUIRE(lat == 110);
+    REQUIRE(route.link_list_.size() == 2);
+    REQUIRE(route.link_list_[0]->get_name() == "link1");
+    REQUIRE(route.link_list_[1]->get_name() == "backbone");
   }
+}
 
-  SECTION("Get route: loopback")
+TEST_CASE("kernel::routing::StarZone: Get routes (netzones)", "")
+{
+  simgrid::s4u::Engine e("test");
+  auto* zone = new simgrid::kernel::routing::StarZone("test");
+
+  auto* subzone1 = new simgrid::kernel::routing::StarZone("subzone1");
+  subzone1->set_parent(zone);
+  auto* subzone2 = new simgrid::kernel::routing::StarZone("subzone2");
+  subzone2->set_parent(zone);
+
+  auto* router1 = subzone1->create_router("router1");
+  auto* router2 = subzone2->create_router("router2");
+
+  SECTION("Get route: netzone")
   {
-    auto* backbone = zone->create_link("backbone", {1000})->set_latency(100)->get_impl();
     std::vector<simgrid::kernel::resource::LinkImpl*> links;
     links.push_back(zone->create_link("link1", {100})->set_latency(10)->get_impl());
-    links.push_back(backbone);
-
-    zone->add_route(host1->get_netpoint(), host1->get_netpoint(), nullptr, nullptr, links, true);
+    std::vector<simgrid::kernel::resource::LinkImpl*> links2;
+    links2.push_back(zone->create_link("link2", {200})->set_latency(20)->get_impl());
+    zone->add_route(subzone1->get_netpoint(), nullptr, router1, nullptr, links, true);
+    zone->add_route(subzone2->get_netpoint(), nullptr, router2, nullptr, links2, true);
     zone->seal();
 
     double lat = 0.0;
-    simgrid::kernel::routing::RouteCreationArgs route;
-    zone->get_local_route(host1->get_netpoint(), host1->get_netpoint(), &route, &lat);
-    REQUIRE(lat == 110);
-    REQUIRE(route.link_list.size() == 2);
-    REQUIRE(route.link_list[0]->get_name() == "link1");
-    REQUIRE(route.link_list[1]->get_name() == "backbone");
+    simgrid::kernel::routing::Route route;
+    zone->get_local_route(subzone1->get_netpoint(), subzone2->get_netpoint(), &route, &lat);
+    REQUIRE(lat == 30);
+    REQUIRE(route.gw_src_ == router1);
+    REQUIRE(route.gw_dst_ == router2);
+    REQUIRE(route.link_list_.size() == 2);
+    REQUIRE(route.link_list_[0]->get_name() == "link1");
+    REQUIRE(route.link_list_[1]->get_name() == "link2");
   }
-}
\ No newline at end of file
+}
+
+TEST_CASE("kernel::routing::StarZone: mix new routes and hosts", "")
+{
+  simgrid::s4u::Engine e("test");
+  auto* zone = simgrid::s4u::create_star_zone("test");
+
+  simgrid::s4u::Link* link = zone->create_link("my_link", 1e6)->seal();
+  for (int i = 0; i < 10; i++) {
+    std::string cpu_name          = "CPU" + std::to_string(i);
+    const simgrid::s4u::Host* cpu = zone->create_host(cpu_name, 1e9)->seal();
+    REQUIRE_NOTHROW(
+        zone->add_route(cpu->get_netpoint(), nullptr, nullptr, nullptr, std::vector<simgrid::s4u::Link*>{link}, true));
+  }
+}