fix ns3

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 128b757..51fae17 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -283,7 +283,7 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
   std::string pm_name_dst = destination->get_name();
 
   /* update net_elm with that of the destination physical host */
   std::string pm_name_dst = destination->get_name();
 
   /* update net_elm with that of the destination physical host */

-  piface_->pimpl_netpoint_ = destination->get_netpoint();
+  piface_->set_netpoint(destination->get_netpoint());

 
   physical_host_ = destination;
 
 
   physical_host_ = destination;
 

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index df15a7a..be6a65d 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -326,14 +326,14 @@ NetworkNS3Action::NetworkNS3Action(Model* model, double totalBytes, s4u::Host* s
   unsigned int node1 = src->get_netpoint()->extension<NetPointNs3>()->node_num;
   unsigned int node2 = dst->get_netpoint()->extension<NetPointNs3>()->node_num;
 
   unsigned int node1 = src->get_netpoint()->extension<NetPointNs3>()->node_num;
   unsigned int node2 = dst->get_netpoint()->extension<NetPointNs3>()->node_num;
 

-  ns3::Ptr<ns3::Node> src_node = src->pimpl_netpoint->extension<NetPointNs3>()->ns3_node_;
-  ns3::Ptr<ns3::Node> dst_node = dst->pimpl_netpoint->extension<NetPointNs3>()->ns3_node_;
+  ns3::Ptr<ns3::Node> src_node = src->get_netpoint()->extension<NetPointNs3>()->ns3_node_;
+  ns3::Ptr<ns3::Node> dst_node = dst->get_netpoint()->extension<NetPointNs3>()->ns3_node_;

 
   xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?",
 
   xbt_assert(node2 < IPV4addr.size(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?",

-             dst->pimpl_netpoint->get_cname());
+             dst->get_netpoint()->get_cname());

   std::string& addr = IPV4addr[node2];
   xbt_assert(not addr.empty(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?",
   std::string& addr = IPV4addr[node2];
   xbt_assert(not addr.empty(), "Element %s is unknown to ns-3. Is it connected to any one-hop link?",

-             dst->pimpl_netpoint->get_cname());
+             dst->get_netpoint()->get_cname());

 
   XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
   ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));
 
   XBT_DEBUG("ns3: Create flow of %.0f Bytes from %u to %u with Interface %s", totalBytes, node1, node2, addr.c_str());
   ns3::PacketSinkHelper sink("ns3::TcpSocketFactory", ns3::InetSocketAddress(ns3::Ipv4Address::GetAny(), port_number));