X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/667b4b34e9d5149c4a69007ec1eba9d7689eb6e5..aa3595ed3c903167f52eeeab8e636bec96b258dd:/src/kernel/routing/NetCard.hpp

diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp
index 40454d49ef..3f0318961f 100644
--- a/src/kernel/routing/NetCard.hpp
+++ b/src/kernel/routing/NetCard.hpp
@@ -10,7 +10,7 @@
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 
-#include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
 /*
 #include <float.h>
 #include <vector>
@@ -27,13 +27,13 @@ namespace routing {
 class NetCard : public simgrid::xbt::Extendable<NetCard> {
 
 public:
-  enum class Type { Host, Router, As };
+  enum class Type { Host, Router, NetZone };
 
-  NetCard(std::string name, NetCard::Type componentType, AsImpl* containingAS)
-      : name_(name), componentType_(componentType), containingAS_(containingAS)
+  NetCard(std::string name, NetCard::Type componentType, NetZoneImpl* netzone_p)
+      : name_(name), componentType_(componentType), netzone_(netzone_p)
   {
-    if (containingAS != nullptr)
-      id_ = containingAS->addComponent(this);
+    if (netzone_p != nullptr)
+      id_ = netzone_p->addComponent(this);
     simgrid::kernel::routing::NetCard::onCreation(this);
   }
   ~NetCard() = default;
@@ -42,10 +42,10 @@ public:
   unsigned int id() { return id_; }
   std::string name() { return name_; }
   const char* cname() { return name_.c_str(); }
-  // This is the AS in which I am
-  AsImpl* containingAS() { return containingAS_; }
+  /** @brief the NetZone in which this netcard is included */
+  NetZoneImpl* netzone() { return netzone_; }
 
-  bool isAS() { return componentType_ == Type::As; }
+  bool isNetZone() { return componentType_ == Type::NetZone; }
   bool isHost() { return componentType_ == Type::Host; }
   bool isRouter() { return componentType_ == Type::Router; }
 
@@ -55,10 +55,12 @@ private:
   unsigned int id_;
   std::string name_;
   NetCard::Type componentType_;
-  AsImpl* containingAS_;
+  NetZoneImpl* netzone_;
 };
 }
 }
 }
 
+XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char* name);
+
 #endif /* KERNEL_ROUTING_NETCARD_HPP_ */