From fe20880bb32a151e72c710d9c115e7e23b290746 Mon Sep 17 00:00:00 2001 From: Leigh B Stoller Date: Thu, 9 Feb 2017 12:37:20 -0700 Subject: [PATCH] Changes for Gen9 geni rack wiring. --- install/genirack/mknewconfig.in | 6 +- install/genirack/tbdb.sql | 13 ++ install/genirack/wiring-Gen9.xml | 362 +++++++++++++++++++++++++++++++ install/phases/boss/genirack | 2 +- 4 files changed, 381 insertions(+), 2 deletions(-) create mode 100644 install/genirack/wiring-Gen9.xml diff --git a/install/genirack/mknewconfig.in b/install/genirack/mknewconfig.in index b8da16d5f..494f1edb3 100755 --- a/install/genirack/mknewconfig.in +++ b/install/genirack/mknewconfig.in @@ -103,6 +103,7 @@ foreach my $node ($wiringdoc->documentElement()->find("./wire")->get_nodelist()) 'location' => $location, 'iface' => GetText('iface', $node), 'role' => GetText('role', $node), + 'type' => GetText('interface_type', $node), 'card' => GetText('card1', $node), 'port' => GetText('port1', $node), 'switch' => GetText('node_id2', $node), @@ -149,7 +150,10 @@ foreach my $current (@wires) { my $device = $devices{$location}; my $mac; my $role = $current->{'role'}; - my $type = "bce"; + my $type = $current->{'type'}; + if (!defined($type)) { + $type = "bce"; + } if ($role eq "mngmnt") { $type = "ilo3"; $mac = $device->{'ilomac'}; diff --git a/install/genirack/tbdb.sql b/install/genirack/tbdb.sql index a53a216ad..655e8d5e8 100644 --- a/install/genirack/tbdb.sql +++ b/install/genirack/tbdb.sql @@ -5,6 +5,13 @@ REPLACE INTO `interface_capabilities` REPLACE INTO `interface_capabilities` VALUES ('bce','ethernet_defspeed','1000000'); +REPLACE INTO `interface_types` + VALUES ('bnx',10000000,1,'Broadcom','10G Ethernet',1,'RJ45'); +REPLACE INTO `interface_capabilities` + VALUES ('bnx','protocols','ethernet'); +REPLACE INTO `interface_capabilities` + VALUES ('bnx','ethernet_defspeed','10000000'); + REPLACE INTO `interface_types` VALUES ('igb',1000000,1,'Intel','Gigabit Ethernet',1,'RJ45'); REPLACE INTO `interface_capabilities` @@ -37,6 +44,12 @@ replace into node_type_attributes set attrvalue='ethernet',attrtype='string'; replace into nodes set node_id='procurve2',phys_nodeid='procurve2',type='hp5406',role='testswitch'; +replace into node_types set + class='switch', isswitch=1, type='hp5406r'; +replace into node_type_attributes set + type='hp5406r',attrkey='forwarding_protocols', + attrvalue='ethernet',attrtype='string'; + REPLACE INTO `switch_stack_types` VALUES ('Experiment','generic',0,0,NULL,257,999,'procurve2'); diff --git a/install/genirack/wiring-Gen9.xml b/install/genirack/wiring-Gen9.xml new file mode 100644 index 000000000..c4db37835 --- /dev/null +++ b/install/genirack/wiring-Gen9.xml @@ -0,0 +1,362 @@ + + + U05 + bce + pc1 + eth0 + ctrl + 0 + 1 + procurve1 + 1 + 1 + + + U05 + bce + pc1 + eth1 + expt + 1 + 1 + procurve2 + 1 + 1 + + + U05 + bce + pc1 + eth2 + expt + 2 + 1 + procurve2 + 1 + 2 + + + U05 + bce + pc1 + eth3 + expt + 3 + 1 + procurve2 + 1 + 3 + + + U05 + bnx + pc1 + eth4 + expt + 4 + 1 + procurve2 + 2 + 1 + + + U05 + bce + pc1 + ilo3 + mngmnt + 99 + 1 + procurve1 + 1 + 2 + + + U06 + bce + pc2 + eth0 + ctrl + 0 + 1 + procurve1 + 1 + 3 + + + U06 + bce + pc2 + eth1 + expt + 1 + 1 + procurve2 + 1 + 4 + + + U06 + bce + pc2 + eth2 + expt + 2 + 1 + procurve2 + 1 + 5 + + + U06 + bce + pc2 + eth3 + expt + 3 + 1 + procurve2 + 1 + 6 + + + U06 + bnx + pc2 + eth4 + expt + 4 + 1 + procurve2 + 2 + 2 + + + U06 + bce + pc2 + ilo3 + mngmnt + 99 + 1 + procurve1 + 1 + 4 + + + U07 + bce + pc3 + eth0 + ctrl + 0 + 1 + procurve1 + 1 + 6 + + + U07 + bce + pc3 + eth1 + expt + 1 + 1 + procurve2 + 1 + 7 + + + U07 + bce + pc3 + eth2 + expt + 2 + 1 + procurve2 + 1 + 8 + + + U07 + bce + pc3 + eth3 + expt + 3 + 1 + procurve2 + 1 + 9 + + + U07 + bnx + pc3 + eth4 + expt + 4 + 1 + procurve2 + 2 + 3 + + + U07 + bce + pc3 + ilo3 + mngmnt + 99 + 1 + procurve1 + 1 + 6 + + + U08 + bce + pc4 + eth0 + ctrl + 0 + 1 + procurve1 + 1 + 7 + + + U08 + bce + pc4 + eth1 + expt + 1 + 1 + procurve2 + 1 + 10 + + + U08 + bce + pc4 + eth2 + expt + 2 + 1 + procurve2 + 1 + 11 + + + U08 + bce + pc4 + eth3 + expt + 3 + 1 + procurve2 + 1 + 12 + + + U08 + bnx + pc4 + eth4 + expt + 4 + 1 + procurve2 + 2 + 4 + + + U08 + bce + pc4 + ilo3 + mngmnt + 99 + 1 + procurve1 + 1 + 8 + + + U09 + bce + pc5 + eth0 + ctrl + 0 + 1 + procurve1 + 1 + 9 + + + U09 + bce + pc5 + eth1 + expt + 1 + 1 + procurve2 + 1 + 13 + + + U09 + bce + pc5 + eth2 + expt + 2 + 1 + procurve2 + 1 + 14 + + + U09 + bce + pc5 + eth3 + expt + 3 + 1 + procurve2 + 1 + 15 + + + U09 + bnx + pc5 + eth4 + expt + 4 + 1 + procurve2 + 2 + 5 + + + U09 + bce + pc5 + ilo3 + mngmnt + 99 + 1 + procurve1 + 1 + 10 + + diff --git a/install/phases/boss/genirack b/install/phases/boss/genirack index 1fcafe56f..5f43caeb0 100755 --- a/install/phases/boss/genirack +++ b/install/phases/boss/genirack @@ -29,7 +29,7 @@ my $RACKVARS = "$PREFIX/etc/genirack/variables.txt"; my $RACKIPS = "$PREFIX/etc/genirack/ips.txt"; my $RACKILO = "$PREFIX/etc/genirack/ilo.xml"; my $RACKWIRES = "$PREFIX/etc/genirack/wiring.xml"; -my $RACKWIRESDEF = "$TOP_SRCDIR/install/genirack/wiring-A.xml"; +my $RACKWIRESDEF = "$TOP_SRCDIR/install/genirack/wiring-Gen9.xml"; my $ILOPASSWORD = "$PREFIX/etc/ilo.pswd"; my $ELABPASSWORD = "$PREFIX/etc/elabman.pswd"; my $HPPASSWORD = "$PREFIX/etc/switch.pswd"; -- GitLab