Commit 12565ec8 authored by Kirk Webb's avatar Kirk Webb

Update for FAROS-SFP base station.

parent c6e5f7d6
......@@ -31,9 +31,5 @@ log-facility local7;
#option time-servers 192.168.4.80;
subnet 192.168.1.0 netmask 255.255.255.0 {
range 192.168.1.101 192.168.1.110;
}
subnet 192.168.2.0 netmask 255.255.255.0 {
range 192.168.2.101 192.168.2.110;
range 192.168.1.101 192.168.1.200;
}
#!/bin/bash
IF1=`/usr/local/etc/emulab/findif -i 192.168.1.1`
IF2=`/usr/local/etc/emulab/findif -i 192.168.2.1`
MYWD=`dirname $0`
if [ -z $IF1 -o -z $IF2 ]
if [ -z $IF1 ]
then
echo "Could not get interfaces for running dhcpd!"
echo "Could not get interface for running dhcpd!"
exit 1
fi
......@@ -19,7 +18,7 @@ cp -f $MYWD/dhcpd.conf /etc/dhcp/dhcpd.conf || \
ed /etc/default/isc-dhcp-server << SNIP
/^INTERFACES/c
INTERFACES="$IF1 $IF2"
INTERFACES="$IF1"
.
w
SNIP
......@@ -41,4 +40,7 @@ SNIP2
fi
service isc-dhcp-server start
apt-get -y install --reinstall avahi-daemon
exit $?
......@@ -12,8 +12,7 @@ import geni.rspec.emulab as elab
# Resource strings
PCIMG = "urn:publicid:IDN+emulab.net+image+argos-test:soapyuhd"
PCHWTYPE = "d430"
IRISHWTYPE = "iris030"
#IRISIMG = "urn:publicid:IDN+phantomnet.org+image+emulab-ops:GENERICDEV-NOVLANS"
FAROSHWTYPE = "faros-sfp"
# Create a Request object to start building the RSpec.
request = portal.context.makeRequestRSpec()
......@@ -22,30 +21,15 @@ request = portal.context.makeRequestRSpec()
pc1 = request.RawPC("pc1")
pc1.hardware_type = PCHWTYPE
pc1.disk_image = PCIMG
pc1.addService(pg.Execute(shell="sh", command="/usr/bin/sudo /local/repository/irishost_start.sh"))
ifpc1ir1 = pc1.addInterface("pc1ir1", pg.IPv4Address("192.168.1.1", "255.255.255.0"))
ifpc1ir2 = pc1.addInterface("pc1ir2", pg.IPv4Address("192.168.2.1", "255.255.255.0"))
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"))
# Request an Iris SDR
ir1 = request.RawPC("iris1")
ir1.hardware_type = IRISHWTYPE
#ir1.disk_image = IRISIMG
# Request a second Iris SDR
ir2 = request.RawPC("iris2")
ir2.hardware_type = IRISHWTYPE
#ir2.disk_image = IRISIMG
# Request a Faros BS
mm1 = request.RawPC("mm1")
mm1.hardware_type = FAROSHWTYPE
# Connect nuc1 to ir1 over the wired net
link1 = request.Link("l1", members=[ifpc1ir1,ir1])
# Connect nuc1 to ir2 over the wired net
link2 = request.Link("l2", members=[ifpc1ir2,ir2])
# Connect the two Iris radios over RF
rflink1 = request.RFLink("rf1")
rflink1.addNode(ir1)
rflink1.addNode(ir2)
link1 = request.Link("l1", members=[if1pc1,mm1])
# 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