# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
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
@clsinit_copy
class LinuxFIBEntry(LinuxApplication):
- _rtype = "LinuxFIBEntry"
+ _rtype = "linux::FIBEntry"
@classmethod
def _register_attributes(cls):
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)
# 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")
if proc.poll():
msg = "Failed to execute command"
self.error(msg, out, err)
- raise RuntimeError, msg
+ raise RuntimeError(msg)
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)
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)
else:
msg = " Failed to execute command '%s'" % command
self.error(msg, out, err)
- raise RuntimeError, msg
+ raise RuntimeError(msg)
def do_stop(self):
command = self.get('command')
if err:
msg = " Failed to execute command '%s'" % command
self.error(msg, out, err)
- raise RuntimeError, msg
+ raise RuntimeError(msg)
@property
def _start_command(self):