-/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2017-2023. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "catch.hpp"
+#include "src/3rd-party/catch.hpp"
+#include "NetZone_test.hpp" // CreateHost callback
#include "simgrid/kernel/routing/FatTreeZone.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/NetZone.hpp"
-
-namespace {
-std::pair<simgrid::kernel::routing::NetPoint*, simgrid::kernel::routing::NetPoint*>
-create_host(simgrid::s4u::NetZone* zone, const std::vector<unsigned int>& /*coord*/, int id)
-{
- const simgrid::s4u::Host* host = zone->create_host(std::to_string(id), 1e9)->seal();
- return std::make_pair(host->get_netpoint(), nullptr);
-}
-} // namespace
TEST_CASE("kernel::routing::FatTreeZone: Creating Zone", "")
{
simgrid::s4u::Engine e("test");
- simgrid::s4u::ClusterCallbacks callbacks(create_host);
+ simgrid::s4u::ClusterCallbacks callbacks(CreateHost{});
REQUIRE(create_fatTree_zone("test", e.get_netzone_root(), {2, {4, 4}, {1, 2}, {1, 2}}, callbacks, 1e9, 10,
simgrid::s4u::Link::SharingPolicy::SHARED));
}
TEST_CASE("kernel::routing::FatTreeZone: Invalid params", "")
{
simgrid::s4u::Engine e("test");
- simgrid::s4u::ClusterCallbacks callbacks(create_host);
+ simgrid::s4u::ClusterCallbacks callbacks(CreateHost{});
SECTION("0 levels")
{