lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update to MiniEdit 2.2.0.1

Browse Source 
- Replace custom code to set OF protocols with new Mininet available API to set.
This commit is contained in:
Gregory Gee
2014-08-16 01:00:25 -04:00
parent 1a53141502
commit 8d493b686e
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/miniedit.py
+17 -28
View File
@@ -13,7 +13,7 @@ Controller icon from http://semlabs.co.uk/
OpenFlow icon from https://www.opennetworking.org/ OpenFlow icon from https://www.opennetworking.org/
""" """
MINIEDIT_VERSION = '2.2.0.0' MINIEDIT_VERSION = '2.2.0.1'
from optparse import OptionParser from optparse import OptionParser
from Tkinter import * from Tkinter import *
@@ -161,35 +161,9 @@ class customOvs(OVSSwitch):
def setSwitchIP(self, ip): def setSwitchIP(self, ip):
self.switchIP = ip self.switchIP = ip
def getOpenFlowVersion(self):
return self.openFlowVersions
def setOpenFlowVersion(self, versions):
self.openFlowVersions = []
if versions['ovsOf10'] == '1':
self.openFlowVersions.append('OpenFlow10')
if versions['ovsOf11'] == '1':
self.openFlowVersions.append('OpenFlow11')
if versions['ovsOf12'] == '1':
self.openFlowVersions.append('OpenFlow12')
if versions['ovsOf13'] == '1':
self.openFlowVersions.append('OpenFlow13')
def configureOpenFlowVersion(self):
if not ( 'OpenFlow11' in self.openFlowVersions or
'OpenFlow12' in self.openFlowVersions or
'OpenFlow13' in self.openFlowVersions ):
return
protoList = ",".join(self.openFlowVersions)
print 'Configuring OpenFlow to '+protoList
self.cmd( 'ovs-vsctl -- set bridge', self, 'protocols='+protoList)
def start( self, controllers ): def start( self, controllers ):
# Call superclass constructor # Call superclass constructor
OVSSwitch.start( self, controllers ) OVSSwitch.start( self, controllers )
# Set OpenFlow Versions
self.configureOpenFlowVersion()
# Set Switch IP address # Set Switch IP address
if (self.switchIP is not None): if (self.switchIP is not None):
self.cmd( 'ifconfig', self, self.switchIP ) self.cmd( 'ifconfig', self, self.switchIP )
@@ -2757,13 +2731,28 @@ class MiniEdit( Frame ):
switchClass = IVSSwitch switchClass = IVSSwitch
else: else:
switchClass = customOvs switchClass = customOvs
if switchClass == customOvs:
# Set OpenFlow versions
self.openFlowVersions = []
if self.appPrefs['openFlowVersions']['ovsOf10'] == '1':
self.openFlowVersions.append('OpenFlow10')
if self.appPrefs['openFlowVersions']['ovsOf11'] == '1':
self.openFlowVersions.append('OpenFlow11')
if self.appPrefs['openFlowVersions']['ovsOf12'] == '1':
self.openFlowVersions.append('OpenFlow12')
if self.appPrefs['openFlowVersions']['ovsOf13'] == '1':
self.openFlowVersions.append('OpenFlow13')
protoList = ",".join(self.openFlowVersions)
switchParms['protocols'] = protoList
newSwitch = net.addSwitch( name , cls=switchClass, **switchParms) newSwitch = net.addSwitch( name , cls=switchClass, **switchParms)
# Some post startup config
if switchClass == CustomUserSwitch: if switchClass == CustomUserSwitch:
if ('switchIP' in opts): if ('switchIP' in opts):
if (len(opts['switchIP']) > 0): if (len(opts['switchIP']) > 0):
newSwitch.setSwitchIP(opts['switchIP']) newSwitch.setSwitchIP(opts['switchIP'])
if switchClass == customOvs: if switchClass == customOvs:
newSwitch.setOpenFlowVersion(self.appPrefs['openFlowVersions'])
if ('switchIP' in opts): if ('switchIP' in opts):
if (len(opts['switchIP']) > 0): if (len(opts['switchIP']) > 0):
newSwitch.setSwitchIP(opts['switchIP']) newSwitch.setSwitchIP(opts['switchIP'])