pf-tools/pf-tools: 2 new changesets
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Thu Apr 10 09:51:19 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/5368ef811a69
changeset: 1263:5368ef811a69
user: shad
date: Thu Apr 10 11:02:37 2014 +0200
description:
NONE
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/f927426e4b3d
changeset: 1264:f927426e4b3d
user: shad
date: Thu Apr 10 11:51:14 2014 +0200
description:
and the tests
diffstat:
lib/PFTools/Conf/Host.pm | 3 +
t/13.conf.cfg1/config-export/COMMON/network-common | 8 +
t/13.conf.cfg1/config-export/SITE/cbv4/CONFIG/hostfile-cbv4-rdeploy | 8 +-
t/13.conf.t | 89 +++++++++-
t/20.files.t | 8 +
5 files changed, 111 insertions(+), 5 deletions(-)
diffs (315 lines):
diff -r 7bd1f6f80db8 -r f927426e4b3d lib/PFTools/Conf/Host.pm
--- a/lib/PFTools/Conf/Host.pm Wed Apr 09 17:50:18 2014 +0200
+++ b/lib/PFTools/Conf/Host.pm Thu Apr 10 11:51:14 2014 +0200
@@ -172,6 +172,9 @@
qq{WARNING no 'dev' section for '$hostname', maybe not enough interface on the server};
next;
}
+ elsif ( $iface eq q{NONE} ) {
+ next;
+ }
my $new_iface_ref = __build_iface_entry(
{ link_name => $link,
hostname => $hostname,
diff -r 7bd1f6f80db8 -r f927426e4b3d t/13.conf.cfg1/config-export/COMMON/network-common
--- a/t/13.conf.cfg1/config-export/COMMON/network-common Wed Apr 09 17:50:18 2014 +0200
+++ b/t/13.conf.cfg1/config-export/COMMON/network-common Thu Apr 10 11:51:14 2014 +0200
@@ -20,3 +20,11 @@
tag = 42
network = 80.125.163.0/24
scope = public
+
+[vlan-public2]
+type = network
+site = cbv4
+comment = another available everywhere
+tag = 43
+network = 80.125.164.0/24
+scope = public
diff -r 7bd1f6f80db8 -r f927426e4b3d t/13.conf.cfg1/config-export/SITE/cbv4/CONFIG/hostfile-cbv4-rdeploy
--- a/t/13.conf.cfg1/config-export/SITE/cbv4/CONFIG/hostfile-cbv4-rdeploy Wed Apr 09 17:50:18 2014 +0200
+++ b/t/13.conf.cfg1/config-export/SITE/cbv4/CONFIG/hostfile-cbv4-rdeploy Thu Apr 10 11:51:14 2014 +0200
@@ -20,6 +20,12 @@
[link::vlan-public]
type = ether
- dev = eth0
+ dev = eth1
ipv4 = 42
+[link::vlan-public2]
+ type = ether
+ dev.0 = eth2
+ dev.1 = NONE
+ ipv4 = 44
+
diff -r 7bd1f6f80db8 -r f927426e4b3d t/13.conf.t
--- a/t/13.conf.t Wed Apr 09 17:50:18 2014 +0200
+++ b/t/13.conf.t Thu Apr 10 11:51:14 2014 +0200
@@ -478,6 +478,7 @@
'vlan-systeme',
'vlan-pfds-int',
'vlan-public',
+ 'vlan-public2',
'vlan-pfds-ext',
'vlan-admindsi',
'vlan-middledsi',
@@ -599,6 +600,14 @@
'tag' => '42',
'type' => 'network',
},
+ 'vlan-public2' => {
+ 'comment' => 'another available everywhere',
+ 'network' => '80.125.164.0/24',
+ 'scope' => 'public',
+ 'site' => 'cbv4',
+ 'tag' => '43',
+ 'type' => 'network',
+ },
'vlan-pfds-int' => {
'network' => '10.2.0.0/16',
'scope' => 'private',
@@ -1061,6 +1070,7 @@
'372' => 'vlan-middledsi',
'13' => 'vlan-systeme',
'42' => 'vlan-public',
+ '43' => 'vlan-public2',
},
'BY_NAME' => {
'vlan-admindsi' => {
@@ -1112,6 +1122,13 @@
'scope' => 'public',
'tag' => '42',
},
+ 'vlan-public2' => {
+ 'comment' => 'another available everywhere',
+ 'network' => '80.125.164.0',
+ 'netmask' => '255.255.255.0',
+ 'scope' => 'public',
+ 'tag' => '43',
+ },
},
'BY_ADDR' => {
'192.168.1.0/24' => 'vlan-pfds-ext',
@@ -1120,6 +1137,7 @@
'10.3.1.0/24' => 'vlan-admindsi',
'10.2.0.0/16' => 'vlan-pfds-int',
'80.125.163.0/24'=> 'vlan-public',
+ '80.125.164.0/24'=> 'vlan-public2',
}
},
'type' => 'site'
@@ -1150,6 +1168,10 @@
'mac' => '00:1e:c9:ff:42:0b',
'vlan' => 'vlan-systeme'
},
+ 'eth1' => {
+ 'ipv4' => '80.125.163.43/24',
+ 'vlan' => 'vlan-public',
+ },
},
'deployment' => {
'dhcpvlan' => 'vlan-systeme',
@@ -1181,6 +1203,14 @@
'mac' => '00:1e:c9:ff:08:e4',
'vlan' => 'vlan-systeme',
},
+ 'eth1' => {
+ 'ipv4' => '80.125.163.42/24',
+ 'vlan' => 'vlan-public',
+ },
+ 'eth2' => {
+ 'ipv4' => '80.125.164.44/24',
+ 'vlan' => 'vlan-public2',
+ },
},
'deployment' => {
'dhcpvlan' => 'vlan-systeme',
@@ -1212,6 +1242,7 @@
'10.1.167.1/16' => 'cbv4-rdeploy01.vlan-systeme',
'80.125.163.42/24' => 'cbv4-rdeploy00.vlan-public',
'80.125.163.43/24' => 'cbv4-rdeploy01.vlan-public',
+ '80.125.164.44/24' => 'cbv4-rdeploy00.vlan-public2',
},
'BY_MAC' => {
'00:1e:c9:ff:42:0b' =>
@@ -1239,6 +1270,7 @@
'13' => 'vlan-systeme',
'40' => 'vlan-pfds-ext',
'42' => 'vlan-public',
+ '43' => 'vlan-public2',
},
'BY_NAME' => {
'vlan-systeme' => {},
@@ -1257,11 +1289,19 @@
'scope' => 'public',
'tag' => '42',
},
+ 'vlan-public2' => {
+ 'comment' => 'another available everywhere',
+ 'network' => '80.125.164.0',
+ 'netmask' => '255.255.255.0',
+ 'scope' => 'public',
+ 'tag' => '43',
+ },
},
'BY_ADDR' => {
'10.1.0.0/16' => 'vlan-systeme',
'192.168.1.0/24' => 'vlan-pfds-ext',
'80.125.163.0/24'=> 'vlan-public',
+ '80.125.164.0/24'=> 'vlan-public2',
}
},
'type' => 'site'
@@ -1283,6 +1323,7 @@
],
'__network_order' => [
'vlan-public',
+ 'vlan-public2',
'vlan-pfds-ext',
],
'cbv4-spawn' => {
@@ -1313,15 +1354,25 @@
'network' => 'A 80.125.163.0',
'netmask' => 'A 255.255.255.0',
},
+ 'vlan-public2' => {
+ 'comment' => 'another available everywhere',
+ 'broadcast' => 'A 80.125.164.255',
+ 'network' => 'A 80.125.164.0',
+ 'netmask' => 'A 255.255.255.0',
+ },
'cbv4-rdeploy' => {
'cbv4-rdeploy00.vlan-public' => 'A 80.125.163.42',
'cbv4-rdeploy01.vlan-public' => 'A 80.125.163.43',
+ 'cbv4-rdeploy00.vlan-public2'=> 'A 80.125.164.44',
'number' => 2,
'comment' => 'Rdeploy server',
'cbv4-rdeploy.vlan-public' => [
'A 80.125.163.42',
'A 80.125.163.43',
],
+ 'cbv4-rdeploy.vlan-public2' => [
+ 'A 80.125.164.44',
+ ],
},
},
'BY_SITE' => {
@@ -1505,6 +1556,10 @@
'cbv4-rdeploy01' => 'cbv4',
'cbv4-rdeploy' => 'cbv4',
},
+ 'vlan-public2' => {
+ 'cbv4-rdeploy' => 'cbv4',
+ 'cbv4-rdeploy00' => 'cbv4',
+ },
}
};
$expected_configuration->{'SITE'}{'BY_NAME'}{'cbv4'}{'NETWORK'}{'BY_NAME'}
@@ -1949,8 +2004,16 @@
'eth0' => {
'ipv4' => '10.1.167.0/16',
'mac' => '00:1e:c9:ff:08:e4',
- 'vlan' => 'vlan-systeme'
- }
+ 'vlan' => 'vlan-systeme',
+ },
+ 'eth1' => {
+ 'ipv4' => '80.125.163.42/24',
+ 'vlan' => 'vlan-public',
+ },
+ 'eth2' => {
+ 'ipv4' => '80.125.164.44/24',
+ 'vlan' => 'vlan-public2',
+ },
},
'deployment' => {
'dhcpvlan' => 'vlan-systeme',
@@ -1978,8 +2041,12 @@
'eth0' => {
'ipv4' => '10.1.167.1/16',
'mac' => '00:1e:c9:ff:42:0b',
- 'vlan' => 'vlan-systeme'
- }
+ 'vlan' => 'vlan-systeme',
+ },
+ 'eth1' => {
+ 'ipv4' => '80.125.163.43/24',
+ 'vlan' => 'vlan-public',
+ },
},
'deployment' => {
'dhcpvlan' => 'vlan-systeme',
@@ -2005,6 +2072,7 @@
'10.1.167.1/16' => 'cbv4-rdeploy01.vlan-systeme',
'80.125.163.42/24' => 'cbv4-rdeploy00.vlan-public',
'80.125.163.43/24' => 'cbv4-rdeploy01.vlan-public',
+ '80.125.164.44/24' => 'cbv4-rdeploy00.vlan-public2',
},
'BY_MAC' => {
'00:1e:c9:ff:42:0b' => 'eth0.cbv4-rdeploy01.vlan-systeme',
@@ -2030,6 +2098,7 @@
'13' => 'vlan-systeme',
'40' => 'vlan-pfds-ext',
'42' => 'vlan-public',
+ '43' => 'vlan-public2',
},
'BY_NAME' => {
'vlan-systeme' => {
@@ -2053,11 +2122,19 @@
'scope' => 'public',
'tag' => '42',
},
+ 'vlan-public2' => {
+ 'comment' => 'another available everywhere',
+ 'network' => '80.125.164.0',
+ 'netmask' => '255.255.255.0',
+ 'scope' => 'public',
+ 'tag' => '43',
+ },
},
'BY_ADDR' => {
'10.1.0.0/16' => 'vlan-systeme',
'192.168.1.0/24' => 'vlan-pfds-ext',
'80.125.163.0/24' => 'vlan-public',
+ '80.125.164.0/24' => 'vlan-public2',
}
},
'type' => 'site'
@@ -2250,6 +2327,10 @@
'mac' => '00:1e:c9:ff:42:0b',
'vlan' => 'vlan-systeme',
},
+ 'eth1' => {
+ 'ipv4' => '80.125.163.43/24',
+ 'vlan' => 'vlan-public',
+ },
},
};
diff -r 7bd1f6f80db8 -r f927426e4b3d t/20.files.t
--- a/t/20.files.t Wed Apr 09 17:50:18 2014 +0200
+++ b/t/20.files.t Thu Apr 10 11:51:14 2014 +0200
@@ -160,6 +160,12 @@
qq{netmask.vlan-public\tIN A\t255.255.255.0},
qq{broadcast.vlan-public\tIN A\t80.125.163.255},
q{},
+ q{; vlan-public2: another available everywhere},
+ q{;----------------------------------------------------------------------------},
+ qq{network.vlan-public2\tIN A\t80.125.164.0},
+ qq{netmask.vlan-public2\tIN A\t255.255.255.0},
+ qq{broadcast.vlan-public2\tIN A\t80.125.164.255},
+ q{},
q{; vlan-pfds-ext: something really interesting},
q{;----------------------------------------------------------------------------},
qq{network.vlan-pfds-ext\tIN A\t192.168.1.0},
@@ -232,7 +238,9 @@
q{;----------------------------------------------------------------------------},
qq{cbv4-rdeploy.vlan-public\tIN A\t80.125.163.42},
qq{cbv4-rdeploy.vlan-public\tIN A\t80.125.163.43},
+ qq{cbv4-rdeploy.vlan-public2\tIN A\t80.125.164.44},
qq{cbv4-rdeploy00.vlan-public\tIN A\t80.125.163.42},
+ qq{cbv4-rdeploy00.vlan-public2\tIN A\t80.125.164.44},
qq{cbv4-rdeploy01.vlan-public\tIN A\t80.125.163.43},
q{},
q{},
More information about the pf-tools-commits
mailing list