Commit c956197e authored by Mac Newbold's avatar Mac Newbold

Added support for names in ir files, and added Show Port Config.

parent 8a60b404
test1:0 00d0b713f399
test1:1 00d0b713f6c9
test1:2 00d0b713f273
test1:3 00d0b713f443
test1:c 00d0b713f639
test10:0 00d0b713f398
test10:1 00d0b713f288
test10:2 00d0b713f515
test10:3 00d0b713f56e
test10:c 00d0b713f3db
test2:0 00d0b713f28e
test2:1 00d0b713f5d5
test2:2 00d0b713f5e8
test2:3 00d0b713f35c
test2:c 00d0b713f56c
test3:0 00d0b713f5ad
test3:1 00d0b713f425
test3:2 00d0b713f419
test3:3 00d0b713f290
test3:c 00d0b713f57d
test4:0 00d0b713f4f0
test4:1 00d0b713f644
test4:2 00d0b713f492
test4:3 00d0b713f65a
test4:c 00d0b713f470
test5:0 00d0b713f473
test5:1 00d0b713f178
test5:2 00d0b713f5a5
test5:3 00d0b713f524
test5:c 00d0b713f686
test6:0 00d0b713f607
test6:1 00d0b713f41c
test6:2 00d0b713f603
test6:3 00d0b7254638
test6:c 00d0b713f467
test7:0 00d0b713f636
test7:1 00d0b713f277
test7:2 00d0b726c1ca
test7:3 00d0b713f44f
test7:c 00d0b713f66c
test8:0 00d0b713f6cd
test8:1 00d0b713f465
test8:2 00d0b713f5d7
test8:3 00d0b713f605
test8:c 00d0b713f5ab
test9:0 009027ca71a6
test9:1 009027ca5cff
test9:2 009027ca9835
test9:3 009027c7e056
test9:c 009027ca983e
plastic 0090278d44c0
tbpc01:0 00d0b713f399 155.99.214.170 1
tbpc01:1 00d0b713f6c9 155.99.214.170 2
tbpc01:2 00d0b713f273 155.99.214.170 3
tbpc01:3 00d0b713f443 155.99.214.170 4
tbpc01:c 00d0b713f639
tbpc02:0 00d0b713f28e 155.99.214.170 5
tbpc02:1 00d0b713f5d5 155.99.214.170 6
tbpc02:2 00d0b713f5e8 155.99.214.170 7
tbpc02:3 00d0b713f35c 155.99.214.170 8
tbpc02:c 00d0b713f56c
tbpc03:0 00d0b713f5ad 155.99.214.170 9
tbpc03:1 00d0b713f425 155.99.214.170 10
tbpc03:2 00d0b713f419 155.99.214.170 11
tbpc03:3 00d0b713f290 155.99.214.170 12
tbpc03:c 00d0b713f57d
tbpc04:0 00d0b713f4f0 155.99.214.170 13
tbpc04:1 00d0b713f644 155.99.214.170 14
tbpc04:2 00d0b713f492 155.99.214.170 15
tbpc04:3 00d0b713f65a 155.99.214.170 16
tbpc04:c 00d0b713f470
tbpc05:0 00d0b713f473 155.99.214.170 17
tbpc05:1 00d0b713f178 155.99.214.170 18
tbpc05:2 00d0b713f5a5 155.99.214.170 19
tbpc05:3 00d0b713f524 155.99.214.170 20
tbpc05:c 00d0b713f686
tbpc06:0 00d0b713f607 155.99.214.170 21
tbpc06:1 00d0b713f41c 155.99.214.170 22
tbpc06:2 00d0b713f603 155.99.214.170 23
tbpc06:3 00d0b7254638 155.99.214.170 24
tbpc06:c 00d0b713f467
tbpc07:0 00d0b713f636 155.99.214.171 21
tbpc07:1 00d0b713f277 155.99.214.171 22
tbpc07:2 00d0b726c1ca 155.99.214.171 23
tbpc07:3 00d0b713f44f 155.99.214.171 24
tbpc07:c 00d0b713f66c
tbpc08:0 00d0b713f6cd 155.99.214.171 17
tbpc08:1 00d0b713f465 155.99.214.171 18
tbpc08:2 00d0b713f5d7 155.99.214.171 19
tbpc08:3 00d0b713f605 155.99.214.171 20
tbpc08:c 00d0b713f5ab
tbpc09:0 009027ca71a6 155.99.214.171 16
tbpc09:1 009027ca5cff 155.99.214.171 15
tbpc09:2 009027ca9835 155.99.214.171 14
tbpc09:3 009027c7e056 155.99.214.171 13
tbpc09:c 009027ca983e
tbpc10:0 00d0b713f398 155.99.214.171 12
tbpc10:1 00d0b713f288 155.99.214.171 11
tbpc10:2 00d0b713f515 155.99.214.171 10
tbpc10:3 00d0b713f56e 155.99.214.171 9
tbpc10:c 00d0b713f3db
This diff is collapsed.
......@@ -37,7 +37,7 @@ snmpit is currently located in /usr/testbed/bin/ on plastic.
and is simply run by typing <code>vsnmpit</code> or <code>vsnmpit
&</code> on the command line. When it starts, you will see this:
<p align=center>
<img src="vsnmpitopening.jpg"/>
<img src="images/vsnmpitopening.jpg"/>
<p>
The buttons at the top bring up their associated menus. As expected,
the Exit button in the top right corner closes vsnmpit.
......@@ -53,44 +53,45 @@ removed. Then each VLAN's members are listed. This shows that the
switch had 10 VLANs, that happened to make a fully connected graph of
5 nodes.
<p align=center>
<img src="vsnmpitvlan.jpg"/>
<img src="images/vsnmpitvlan.jpg"/>
<p>
The process of removing VLANs is quite simple. First, select some
VLANs to remove. Like this:
<p align=center>
<img src="vsnmpitvlanr1.jpg"/>
<img src="images/vsnmpitvlanr1.jpg"/>
<p>
Then press the Remove button, and you'll see this:
<p align=center>
<img src="vsnmpitvlanr2.jpg"/>
<img src="images/vsnmpitvlanr2.jpg"/>
<p>
When it finishes, you'll get something like this:
<p align=center>
<img src="vsnmpitvlanr3.jpg"/>
<img src="images/vsnmpitvlanr3.jpg"/>
<p>
The File button is used to add a set of VLANs specified in a setup
file. See <a href="#file">here</a> for details on making this file. It
is really quite simple. First, type in the file name. Here we use
<code>t1-10.i0</code>, a file that takes machines test1 through
test10, and adds their first interface, i0, to a VLAN. In this way,
<code>t1-10.i0</code>, a file that takes machines tbpc01 through
tbpc10, and adds their first interface, i0, to a VLAN. In this way,
all the machines can talk to each other on thier first interface.
<p align=center>
<img src="vsnmpitvlanf1.jpg"/>
<img src="images/vsnmpitvlanf1.jpg"/>
<p>
Then it will show you this:
<p align=center>
<img src="vsnmpitvlanf2.jpg"/>
<img src="images/vsnmpitvlanf2.jpg"/>
<p>
And when it finishes, the switch will be configured like this:
<p align=center>
<img src="vsnmpitvlanf3.jpg"/>
<img src="images/vsnmpitvlanf3.jpg"/>
<p>
<a name="vPort"></a>
<h3>Port Setup</h3>
<p>
This part of vsnmpit has not finished yet. Coming soon. For ways to
configure ports with command-line snmpit, see <a href="#port">here</a>.
Choose a switch, and it will show you its ports, and the way they are
currently configured. Then make any changes you like, and hit the
update button.
</p>
<a name="voptions"></a>
<h3>Options</h3>
......@@ -99,7 +100,7 @@ options from snmpit. The first deals with VLANs only, and the last two
only pertain to port setup. This is what you'll see when you choose
this menu. Its pretty self explanatory. The default values are shown here.
<p align=center>
<img src="vsnmpitoptions.jpg"/>
<img src="images/vsnmpitoptions.jpg"/>
<p>
......@@ -123,7 +124,7 @@ Syntax:
snmpit [-h] [-v] -i&lt;ip>
[-u] [-l] [-m&lt;vlan name>] [-vlan&lt;MAC Addr.>]
[-f&lt;filename>] [-r&lt;vlan #> &lt;vlan #> ... ]
[+b|-b] [+c|-c] [-p&lt;port> &lt;port> &lt;x>..&lt;y> ... ]
[+b|-b] [+c|-c] [-s] [-p&lt;port> &lt;port> &lt;x>..&lt;y> ... ]
[-d|-e] [+a|-a] [-s&lt;speed>] [-dup&lt;duplex>]
General:
......@@ -142,11 +143,12 @@ VLAN Control:
Port Control:
+b/-b Blocking mode (now off)
+c/-c Confirm Changes (now on)
-s Show Port Configurations
-p List of port numbers and ranges
-d Disable port(s)
-e Enable port(s)
+a/-a Enable/Disable Port Auto-Negotiation of speed/duplex
-s Port Speed (10 or 100 Mbits)
-spd Port Speed (10 or 100 Mbits)
-dup Port Duplex (half or full)
</pre>
<a name="general"></a>
......@@ -176,7 +178,7 @@ Delta/155.99.214.173 </pre>
[-f&lt;filename>] [-r&lt;vlan #> &lt;vlan #> ... ]</pre>
<code>snmpit</code> also understands machine names and interfaces in
the format &lt;name>:&lt;interface>, such as test1:0 or test3:3, in
the format &lt;name>:&lt;interface>, such as tbpc01:0 or tbpc03:3, in
place of MAC addresses. Output of known MAC addresses will also be
converted to this format. Therefore, anywhere that a MAC address is
used, you may also supply a name/interface pair.
......@@ -213,41 +215,32 @@ generally be output of the assignment algorithms used to map a virtual
topology to the physical topology of the testbed. They can also be
created by hand. The important section has the following format:
<pre>START vlan
switch &lt;SwitchName/IP>
1C2B536AF27C 008b1ca721d0
1073c38b28fd 283bc8a82f8c
link1 1C2B536AF27C 008b1ca721d0
link2 1073c38b28fd 283bc8a82f8c
...
end switch
switch &lt;SwitchName/IP>
&lt;MAC 1> &lt;MAC 2>
&lt;MAC 3> &lt;MAC 4>
&lt;name1> &lt;MAC 1> &lt;MAC 2>
&lt;name2> &lt;MAC 3> &lt;MAC 4>
...
end switch
switch Gamma
test1:0 test2:0
test1:1 test3:0
test1:2 test4:0
test1:3 test5:0
test2:1 test3:1
test2:2 test4:1
test2:3 test5:1
test3:2 test4:2
test3:3 test5:2
test4:3 test5:3
end switch
a_b tbpc01:0 tbpc02:0
a_c tbpc01:1 tbpc03:0
a_d tbpc01:2 tbpc04:0
a_e tbpc01:3 tbpc05:0
b_c tbpc02:1 tbpc03:1
b_d tbpc02:2 tbpc04:1
b_e tbpc02:3 tbpc05:1
c_d tbpc03:2 tbpc04:2
c_e tbpc03:3 tbpc05:2
d_e tbpc04:3 tbpc05:3
END vlan</pre>
After starting the VLAN sectiom of the file, the keyword
"<tt>switch</tt>" is followed by a switch name or IP address. Each
line after that should contain a list of MAC addresses to be put in a
After starting the VLAN sectiom of the file each
line should contain a VLAN name and a list of MAC addresses to be put in a
VLAN together. There should be at least two, but the actual number is
unlimited. Then the keywords "<tt>end switch</tt>" are used before starting
another switch, and and when finished, the VLAN section is closed. As
mentioned above, the syntax "testM:I" can be used where M is the
unlimited. When finished, the VLAN section is closed. As
mentioned above, the syntax "tbpcM:I" can be used where M is the
machine number, and I is the interface, from 0 to 3. The demonstration above
shows a fully connected graph with 5 nodes.
<dt><pre> -r Remove VLAN(s) </pre>
<dt><pre> -r Remove VLAN(s) </pre>
<dd>This command takes as its parameter a list of VLAN numbers. These
VLAN numbers are given as output from snmpit every time a VLAN is
created. VLAN numbers can also be found when listing VLANs. This
......@@ -291,7 +284,7 @@ ports, or with the "<tt>-a</tt" command, turn off this
feature. Default is to use 100Mbps, Full duplex, unless it is not
supported by the link, in which case it lowers one or both to 10Mbps,
Half duplex.
<dt><pre> -s Port Speed (10 or 100 Mbits)</pre>
<dt><pre> -spd Port Speed (10 or 100 Mbits)</pre>
<dd>This command takes as its parameter a number, either 10 or 100,
then configures the port to use that speed. Use of this command
automatically turns off the auto-negotiate feature.
......
# This ir file adds a system vlan - connects every interface to every
# other one
start vlan
net1 tbpc01:0 tbpc02:0 tbpc03:0 tbpc04:0 tbpc05:0 tbpc06:0 tbpc07:0 tbpc08:0 tbpc09:0 tbpc10:0
net2 tbpc01:1 tbpc02:1 tbpc03:1 tbpc04:1 tbpc05:1 tbpc06:1 tbpc07:1 tbpc08:1 tbpc09:1 tbpc10:1
net3 tbpc01:2 tbpc02:2 tbpc03:2 tbpc04:2 tbpc05:2 tbpc06:2 tbpc07:2 tbpc08:2 tbpc09:2 tbpc10:2
net4 tbpc01:3 tbpc02:3 tbpc03:3 tbpc04:3 tbpc05:3 tbpc06:3 tbpc07:3 tbpc08:3 tbpc09:3 tbpc10:3
end vlan
# This ir file adds a system vlan - connects every interface to every
# other one
start vlan
switch gamma
test1:0 test1:1 test1:2 test1:3 test2:0 test2:1 test2:2 test2:3 test3:0 test3:1 test3:2 test3:3 test4:0 test4:1 test4:2 test4:3 test5:0 test5:1 test5:2 test5:3 test6:0 test6:1 test6:2 test6:3 test7:0 test7:1 test7:2 test7:3 test8:0 test8:1 test8:2 test8:3 test9:0 test9:1 test9:2 test9:3 test10:0 test10:1 test10:2 test10:3
end
all tbpc01:0 tbpc01:1 tbpc01:2 tbpc01:3 tbpc02:0 tbpc02:1 tbpc02:2 tbpc02:3 tbpc03:0 tbpc03:1 tbpc03:2 tbpc03:3 tbpc04:0 tbpc04:1 tbpc04:2 tbpc04:3 tbpc05:0 tbpc05:1 tbpc05:2 tbpc05:3 tbpc06:0 tbpc06:1 tbpc06:2 tbpc06:3 tbpc07:0 tbpc07:1 tbpc07:2 tbpc07:3 tbpc08:0 tbpc08:1 tbpc08:2 tbpc08:3 tbpc09:0 tbpc09:1 tbpc09:2 tbpc09:3 tbpc10:0 tbpc10:1 tbpc10:2 tbpc10:3
end vlan
# This ir file adds a system vlan - connects every interface to every
# other one
start vlan
net1 tbpc01:0 tbpc02:0 tbpc03:0 tbpc04:0 tbpc05:0 tbpc06:0 tbpc07:0 tbpc08:0 tbpc09:0 tbpc10:0 plastic
net2 tbpc01:1 tbpc02:1 tbpc03:1 tbpc04:1 tbpc05:1 tbpc06:1 tbpc07:1 tbpc08:1 tbpc09:1 tbpc10:1 plastic
net3 tbpc01:2 tbpc02:2 tbpc03:2 tbpc04:2 tbpc05:2 tbpc06:2 tbpc07:2 tbpc08:2 tbpc09:2 tbpc10:2 plastic
net4 tbpc01:3 tbpc02:3 tbpc03:3 tbpc04:3 tbpc05:3 tbpc06:3 tbpc07:3 tbpc08:3 tbpc09:3 tbpc10:3 plastic
end vlan
# This ir file adds a system vlan - connects every interface to every
# other one
start vlan
all_c tbpc01:0 tbpc01:1 tbpc01:2 tbpc01:3 tbpc02:0 tbpc02:1 tbpc02:2 tbpc02:3 tbpc03:0 tbpc03:1 tbpc03:2 tbpc03:3 tbpc04:0 tbpc04:1 tbpc04:2 tbpc04:3 tbpc05:0 tbpc05:1 tbpc05:2 tbpc05:3 tbpc06:0 tbpc06:1 tbpc06:2 tbpc06:3 tbpc07:0 tbpc07:1 tbpc07:2 tbpc07:3 tbpc08:0 tbpc08:1 tbpc08:2 tbpc08:3 tbpc09:0 tbpc09:1 tbpc09:2 tbpc09:3 tbpc10:0 tbpc10:1 tbpc10:2 tbpc10:3 plastic
end vlan
START vlan
a_b tbpc01:0 tbpc02:0
a_c tbpc01:1 tbpc03:0
a_d tbpc01:2 tbpc04:0
a_e tbpc01:3 tbpc05:0
b_c tbpc02:1 tbpc03:1
b_d tbpc02:2 tbpc04:1
b_e tbpc02:3 tbpc05:1
c_d tbpc03:2 tbpc04:2
c_e tbpc03:3 tbpc05:2
d_e tbpc04:3 tbpc05:3
END vlan
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