Commit 26606ff1 authored by Leigh Stoller's avatar Leigh Stoller

Add FW-IPTABLES and UBUNTU10-STD-FW

parent 6d3109cc
......@@ -3,7 +3,7 @@
<value>FEDORA10-STD</value>
</mapping>
<mapping name="FBSD-STD">
<value>FBSD73-STD</value>
<value>FBSD82-STD</value>
</mapping>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
......@@ -32,6 +32,19 @@
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>4.X</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>IPTables Firewall</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup,veths,linktest</value></attribute>
<attribute name="magic"><value></value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="nextosid"><value>emulab-ops,UBUNTU10-STD-FW</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osname"><value>FW-IPTABLES</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>120</value></attribute>
<attribute name="shared"><value>0</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Other</value></attribute>
<attribute name="description"><value>Stub descriptor for power controllers of any kind</value></attribute>
......@@ -44,6 +57,18 @@
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>0.00</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>Any Version of FreeBSD</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup,veths,veth-ne,veth-en,mlinks,linktest,linkdelays,vlans</value></attribute>
<attribute name="magic"><value>FreeBSD</value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>NORMAL</value></attribute>
<attribute name="osname"><value>FBSD-STD</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>NewNode (FreeBSD) in an MFS</value></attribute>
......@@ -58,18 +83,6 @@
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>6.2</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>Any Version of FreeBSD</value></attribute>
<attribute name="features"><value>ping,ssh,ipod,isup,veths,veth-ne,veth-en,mlinks,linktest,linkdelays,vlans</value></attribute>
<attribute name="magic"><value>FreeBSD</value></attribute>
<attribute name="mustclean"><value>1</value></attribute>
<attribute name="op_mode"><value>NORMAL</value></attribute>
<attribute name="osname"><value>FBSD-STD</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="reboot_waittime"><value>150</value></attribute>
<attribute name="shared"><value>1</value></attribute>
</osid>
<osid>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Any of RedHat Linux</value></attribute>
......@@ -114,17 +127,32 @@
</image>
<image>
<attribute name="OS"><value>FreeBSD</value></attribute>
<attribute name="description"><value>FreeBSD 7.3</value></attribute>
<attribute name="description"><value>FreeBSD 8.2 32-bit version</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>FBSD73-STD</value></attribute>
<attribute name="imagename"><value>FBSD82-STD</value></attribute>
<attribute name="loadpart"><value>1</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,mlinks,linktest,linkdelays,vlans</value></attribute>
<attribute name="path"><value>/usr/testbed/images/FBSD73-STD.ndz</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,mlinks,linktest,vlans</value></attribute>
<attribute name="path"><value>/usr/testbed/images/FBSD82-STD.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>0</value></attribute>
<attribute name="version"><value>7.3</value></attribute>
<attribute name="version"><value>8.2</value></attribute>
</image>
<image>
<attribute name="OS"><value>Linux</value></attribute>
<attribute name="description"><value>Firewall image based on ubuntu 10</value></attribute>
<attribute name="gid"><value>emulab-ops</value></attribute>
<attribute name="global"><value>1</value></attribute>
<attribute name="imagename"><value>UBUNTU10-STD-FW</value></attribute>
<attribute name="loadpart"><value>2</value></attribute>
<attribute name="mbr_version"><value>2</value></attribute>
<attribute name="op_mode"><value>NORMALv2</value></attribute>
<attribute name="osfeatures"><value>ping,ssh,ipod,isup,linktest</value></attribute>
<attribute name="path"><value>/proj/emulab-ops/images/UBUNTU10-STD-FW.ndz</value></attribute>
<attribute name="pid"><value>emulab-ops</value></attribute>
<attribute name="shared"><value>1</value></attribute>
<attribute name="version"><value>10</value></attribute>
</image>
</descriptors>
......@@ -20,10 +20,11 @@ sub usage()
print STDERR " -m dump just the MFS descriptors.\n";
print STDERR " -v 1 first generation STD images (FBSD410, RHL90)\n";
print STDERR " -v 2 second generation STD images (FBSD62, FC6)\n";
print STDERR "Default version is 1.\n";
print STDERR " -v 3 second generation STD images (FBSD73, FEDORA10)\n";
print STDERR "Default version is 2.\n";
exit(-1);
}
my $version = 1;
my $version = 2;
my $mfsonly = 0;
my $images;
......@@ -39,11 +40,21 @@ my %imagenames = (
# included here to resolve nextosid entries for FW-IPFW and FBSD-JAIL
"2" => ['FBSD62+FC6-STD', 'FBSD62-STD', 'FC6-STD', 'FBSD410-STD',
'FBSD410-IPFW2', 'UBUNTU10-STD-FW'],
# No longer using combined images.
# The UBUNTU10 image is for FW-IPTABLES link.
"3" => ['FBSD82-STD', 'FEDORA10-STD', 'UBUNTU10-STD-FW'],
);
my @osnames = ('FREEBSD-MFS', 'FRISBEE-MFS', 'NEWNODE-MFS',
'OPSNODE-BSD', 'FW-IPFW', 'FW-IPFW2', 'FW-IPTABLES',
'RHL-STD', 'FBSD-STD', 'FBSD-JAIL', 'POWER-CONTROLLER');
my %osnames = (
"1" => ['FREEBSD-MFS', 'FRISBEE-MFS', 'NEWNODE-MFS',
'OPSNODE-BSD', 'FW-IPFW', 'FW-IPFW2', 'FW-IPTABLES',
'RHL-STD', 'FBSD-STD', 'FBSD-JAIL', 'POWER-CONTROLLER'],
"2" => ['FREEBSD-MFS', 'FRISBEE-MFS', 'NEWNODE-MFS',
'OPSNODE-BSD', 'FW-IPFW', 'FW-IPFW2', 'FW-IPTABLES',
'RHL-STD', 'FBSD-STD', 'FBSD-JAIL', 'POWER-CONTROLLER'],
"3" => ['FREEBSD-MFS', 'FRISBEE-MFS', 'NEWNODE-MFS', 'FW-IPTABLES',
'OPSNODE-BSD', 'RHL-STD', 'FBSD-STD', 'POWER-CONTROLLER'],
);
my @osids = ();
......@@ -59,6 +70,10 @@ my %mappings = (
"2" => {
"RHL-STD" => "FC6-STD",
"FBSD-STD" => "FBSD62-STD",
},
"3" => {
"RHL-STD" => "FEDORA10-STD",
"FBSD-STD" => "FBSD82-STD",
}
);
......@@ -120,7 +135,7 @@ elsif (defined($images)) {
$version = 0;
$mfsonly = 0;
%mappings = ();
@osnames = ();
%osnames = ("$version" => []);
%imagenames = ("$version" => $images);
}
usage()
......@@ -159,7 +174,7 @@ foreach my $imagename (@{$imagenames{$version}}) {
#
# And the OSs
#
foreach my $osname (@osnames) {
foreach my $osname (@{$osnames{$version}}) {
my $osinfo = OSinfo->Lookup("$protoproj,$osname");
if (!defined($osinfo)) {
fatal("Cannot find os descriptor for $osname");
......
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