"""
bridge_name = Attribute("bridge_name", "Name of the switch/bridge",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
virtual_ip_pref = Attribute("virtual_ip_pref", "Virtual IP/PREFIX of the switch",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
controller_ip = Attribute("controller_ip", "IP of the controller",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
controller_port = Attribute("controller_port", "Port of the controller",
- flags = Flags.ExecReadOnly)
+ flags = Flags.Design)
cls._register_attribute(bridge_name)
cls._register_attribute(virtual_ip_pref)
@property
def node(self):
- node = self.get_connected(PlanetlabNode.rtype())
+ node = self.get_connected(PlanetlabNode.get_rtype())
if node: return node[0]
return None
# """
# rm = self.ec.get_resource(guid)
-# if rm.rtype() in self._authorized_connections:
+# if rm.get_rtype() in self._authorized_connections:
# msg = "Connection between %s %s and %s %s accepted" % \
-# (self.rtype(), self._guid, rm.rtype(), guid)
+# (self.get_rtype(), self._guid, rm.get_rtype(), guid)
# self.debug(msg)
# return True
# msg = "Connection between %s %s and %s %s refused" % \
-# (self.rtype(), self._guid, rm.rtype(), guid)
+# (self.get_rtype(), self._guid, rm.get_rtype(), guid)
# self.debug(msg)
# return False
"""
node = self.node
if not node or node.state < ResourceState.READY:
- self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state )
+ #self.debug("---- RESCHEDULING DEPLOY ---- node state %s " % self.node.state )
self.ec.schedule(reschedule_delay, self.deploy)
-
- else:
- self.do_discover()
- self.do_provision()
- self.check_sliver_ovs()
- self.servers_on()
- self.create_bridge()
- self.assign_contr()
- self.ovs_status()
+ return
+
+ self.do_discover()
+ self.do_provision()
+ self.check_sliver_ovs()
+ self.servers_on()
+ self.create_bridge()
+ self.assign_controller()
+ self.ovs_status()
- super(OVSWitch, self).do_deploy()
+ super(OVSWitch, self).do_deploy()
def servers_on(self):
""" Start the openvswitch servers and also checking
(out, err), proc = self.node.check_output(self.ovs_checks, 'start_srv_exitcode')
if out != "0\n":
- self.debug("Servers have not started")
+ self.error("Servers have not started")
raise RuntimeError, msg
cmd = "ps -A | grep ovsdb-server"
(out, err), proc = self.node.check_output(self.ovs_checks, 'status_srv_exitcode')
if out != "0\n":
- self.debug("Servers are not running")
+ self.error("Servers are not running")
raise RuntimeError, msg
self.info("Servers started")
# TODO: Add check for virtual_ip belonging to vsys_tag
self.del_old_br()
- if self.get("bridge_name") and self.get("virtual_ip_pref"):
- bridge_name = self.get("bridge_name")
- virtual_ip_pref = self.get("virtual_ip_pref")
- self.info(" Creating the bridge %s and assigning %s" %\
- (bridge_name, virtual_ip_pref) )
- cmd = "sliver-ovs create-bridge '%s' '%s'" %\
- (bridge_name, virtual_ip_pref)
- out = err = ""
- (out, err), proc = self.node.run_and_wait(cmd, self.ovs_checks,
- shfile = "create_br.sh",
- pidfile = "create_br_pidfile",
- ecodefile = "create_br_exitcode",
- sudo = True,
- stdout = "create_br_stdout",
- stderr = "create_br_stderr")
- (out, err), proc = self.node.check_output(self.ovs_checks, 'create_br_exitcode')
- if out != "0\n":
- msg = "No such pltap netdev\novs-appctl: ovs-vswitchd: server returned an error"
- self.debug("Check again the virtual IP")
- raise RuntimeError, msg
- self.info("Bridge %s created" % bridge_name)
-
- else:
+ if not (self.get("bridge_name") and self.get("virtual_ip_pref")):
msg = "No assignment in one or both attributes"
self.error(msg)
self.debug("Bridge name is %s and virtual_ip_pref is %s" %\
(self.get("bridge_name"), self.get("virtual_ip_pref")) )
raise AttributeError, msg
+
+ bridge_name = self.get("bridge_name")
+ virtual_ip_pref = self.get("virtual_ip_pref")
+ self.info(" Creating the bridge %s and assigning %s" %\
+ (bridge_name, virtual_ip_pref) )
+ cmd = "sliver-ovs create-bridge '%s' '%s'" %\
+ (bridge_name, virtual_ip_pref)
+ out = err = ""
+ (out, err), proc = self.node.run_and_wait(cmd, self.ovs_checks,
+ shfile = "create_br.sh",
+ pidfile = "create_br_pidfile",
+ ecodefile = "create_br_exitcode",
+ sudo = True,
+ stdout = "create_br_stdout",
+ stderr = "create_br_stderr")
+
+ (out, err), proc = self.node.check_output(self.ovs_checks, 'create_br_exitcode')
+ if out != "0\n":
+ msg = "No such pltap netdev\novs-appctl: ovs-vswitchd: server returned an error"
+ self.debug("Check again the virtual IP")
+ raise RuntimeError, msg
+
+ self.info("Bridge %s created" % bridge_name)
+
- def assign_contr(self):
+ def assign_controller(self):
""" Set the controller IP
"""
if self.get("controller_ip") and self.get("controller_port"):
# Node needs to wait until all associated RMs are released
# to be released
from nepi.resources.planetlab.openvswitch.ovsport import OVSPort
- rm = self.get_connected(OVSPort.rtype())
+ rm = self.get_connected(OVSPort.get_rtype())
- if rm[0].state < ResourceState.FINISHED:
+ if rm[0].state < ResourceState.STOPPED:
self.ec.schedule(reschedule_delay, self.release)
return
git://git.onelab.eu / nepi.git / blobdiff