Commit 1aabd82b authored by Kirk Webb's avatar Kirk Webb

Try again.

parent aeb6cc05
......@@ -11,7 +11,7 @@ import geni.rspec.emulab as elab
# Resource strings
PCIMG = "urn:publicid:IDN+emulab.net+image+emulab-ops:UBUNTU16-64-STD"
PCHWTYPE = "d430"
PCHWTYPE = "d840"
FAROSHWTYPE = "faros_sfp"
# Create a Request object to start building the RSpec.
......@@ -23,14 +23,23 @@ pc1.hardware_type = PCHWTYPE
pc1.disk_image = PCIMG
pc1.addService(pg.Execute(shell="sh", command="/usr/bin/sudo /local/repository/faros_start.sh"))
if1pc1 = pc1.addInterface("if1pc1", pg.IPv4Address("192.168.1.1", "255.255.255.0"))
if1pc1.bandwidth = 40 * 1000 * 1000
# Request a Faros BS.
mm1 = request.RawPC("mm1")
mm1.hardware_type = FAROSHWTYPE
mm1if1 = mm1.addInterface("mm1if1")
mm1if2 = mm1.addInterface("mm1if2")
mm1if3 = mm1.addInterface("mm1if3")
mm1if4 = mm1.addInterface("mm1if4")
# Connect the PC to the Faros BS.
link1 = request.Link("l1", members=[if1pc1,mm1])
link1.bandwidth = 10 * 1000 * 1000
lan1 = request.LAN("lan1")
lan1.addInterface(if1pc1)
lan1.addInterface(mm1if1)
lan1.addInterface(mm1if2)
lan1.addInterface(mm1if3)
lan1.addInterface(mm1if4)
# Print the RSpec to the enclosing page.
portal.context.printRequestRSpec()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment