Changing ResourceManager naming for platform::ResourceName

[nepi.git] / src / nepi / resources / linux / ccn / fibentry.py

diff --git a/src/nepi/resources/linux/ccn/fibentry.py b/src/nepi/resources/linux/ccn/fibentry.py
index 700ab10..9809547 100644 (file)
--- a/src/nepi/resources/linux/ccn/fibentry.py
+++ b/src/nepi/resources/linux/ccn/fibentry.py
@@ -20,7 +20,7 @@
 from nepi.execution.attribute import Attribute, Flags, Types
 from nepi.execution.trace import Trace, TraceAttr
 from nepi.execution.resource import clsinit_copy, ResourceState, \
-    ResourceAction, reschedule_delay
+    ResourceAction
 from nepi.resources.linux.application import LinuxApplication
 from nepi.resources.linux.ccn.ccnd import LinuxCCND
 from nepi.util.timefuncs import tnow
@@ -35,7 +35,7 @@ import time
 
 @clsinit_copy
 class LinuxFIBEntry(LinuxApplication):
-    _rtype = "LinuxFIBEntry"
+    _rtype = "linux::FIBEntry"
 
     @classmethod
     def _register_attributes(cls):
@@ -126,12 +126,12 @@ class LinuxFIBEntry(LinuxApplication):
         if name == "ping":
             if not self.ping:
                 return None
-            return self.ec.trace(self.ping, "stdout", attr, block, offset)
+            return self.ec.trace(self.ping.guid, "stdout", attr, block, offset)
 
         if name == "traceroute":
             if not self.traceroute:
                 return None
-            return self.ec.trace(self.traceroute, "stdout", attr, block, offset)
+            return self.ec.trace(self.traceroute.guid, "stdout", attr, block, offset)
 
         return super(LinuxFIBEntry, self).trace(name, attr, block, offset)
     
@@ -139,7 +139,7 @@ class LinuxFIBEntry(LinuxApplication):
         # Wait until associated ccnd is provisioned
         if not self.ccnd or self.ccnd.state < ResourceState.READY:
             # ccnr needs to wait until ccnd is deployed and running
-            self.ec.schedule(reschedule_delay, self.deploy)
+            self.ec.schedule(self.reschedule_delay, self.deploy)
         else:
             if not self.get("ip"):
                 host = self.get("host")
@@ -187,7 +187,7 @@ class LinuxFIBEntry(LinuxApplication):
     def configure(self):
         if self.trace_enabled("ping") and not self.ping:
             self.info("Configuring PING trace")
-            ping = self.ec.register_resource("LinuxPing")
+            ping = self.ec.register_resource("linux::Ping")
             self.ec.set(ping, "printTimestamp", True)
             self.ec.set(ping, "target", self.get("host"))
             self.ec.set(ping, "earlyStart", True)
@@ -198,12 +198,13 @@ class LinuxFIBEntry(LinuxApplication):
 
         if self.trace_enabled("traceroute") and not self.traceroute:
             self.info("Configuring TRACEROUTE trace")
-            traceroute = self.ec.register_resource("LinuxTraceroute")
+            traceroute = self.ec.register_resource("linux::Traceroute")
             self.ec.set(traceroute, "printTimestamp", True)
             self.ec.set(traceroute, "continuous", True)
             self.ec.set(traceroute, "target", self.get("host"))
             self.ec.set(traceroute, "earlyStart", True)
             self.ec.register_connection(traceroute, self.node.guid)
+            self.ec.register_connection(traceroute, self.guid)
             # schedule mtr deploy
             self.ec.deploy(guids=[traceroute], group = self.deployment_group)