pf-tools/pf-tools: test avec un vlan declaré uniquement dans un ...
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Fri Apr 4 16:09:20 UTC 2014
details: http://hg.debian.org/hg/pf-tools/pf-tools/rev/1af4f9bb4d64
changeset: 1249:1af4f9bb4d64
user: shad
date: Fri Apr 04 18:09:15 2014 +0200
description:
test avec un vlan declaré uniquement dans un site et utilisé uniquement pas une machine de ce site, site different de celui que l'on test
diffstat:
t/13.conf.cfg1/config-export/COMMON/network-common | 7 +
t/13.conf.cfg1/config-export/SITE/cbv4/CONFIG/hostfile-cbv4-rdeploy | 9 +-
t/13.conf.t | 64 +++++++++-
t/20.files.t | 11 +
4 files changed, 83 insertions(+), 8 deletions(-)
diffs (238 lines):
diff -r 2d8d0d805bcc -r 1af4f9bb4d64 t/13.conf.cfg1/config-export/COMMON/network-common
--- a/t/13.conf.cfg1/config-export/COMMON/network-common Fri Apr 04 17:05:18 2014 +0200
+++ b/t/13.conf.cfg1/config-export/COMMON/network-common Fri Apr 04 18:09:15 2014 +0200
@@ -13,3 +13,10 @@
network = 10.2.0.0/16
scope = private
+[vlan-public]
+type = network
+site = cbv4
+comment = a vlan available everywhere
+tag = 42
+network = 80.125.163.0/24
+scope = public
diff -r 2d8d0d805bcc -r 1af4f9bb4d64 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 Fri Apr 04 17:05:18 2014 +0200
+++ b/t/13.conf.cfg1/config-export/SITE/cbv4/CONFIG/hostfile-cbv4-rdeploy Fri Apr 04 18:09:15 2014 +0200
@@ -10,10 +10,6 @@
mac.0 = 00:1e:c9:ff:08:e4
mac.1 = 00:1e:c9:ff:42:0b
-#[interface::eth0.TAG1]
-# ipv4 = 111.167.0
-# vlan = vlan-admindsi
-
[hostgroup]
model = MOD:model-rdeploy
number = 2
@@ -22,3 +18,8 @@
hostname = cbv4-rdeploy%%
# site = cbv4
+[link::vlan-public]
+ type = ether
+ dev = eth0
+ ipv4 = 42
+
diff -r 2d8d0d805bcc -r 1af4f9bb4d64 t/13.conf.t
--- a/t/13.conf.t Fri Apr 04 17:05:18 2014 +0200
+++ b/t/13.conf.t Fri Apr 04 18:09:15 2014 +0200
@@ -477,6 +477,7 @@
'cbv4-pfds-filer%%',
'vlan-systeme',
'vlan-pfds-int',
+ 'vlan-public',
'vlan-pfds-ext',
'vlan-admindsi',
'vlan-middledsi',
@@ -590,6 +591,14 @@
'tag' => '40',
'type' => 'network',
},
+ 'vlan-public' => {
+ 'comment' => 'a vlan available everywhere',
+ 'network' => '80.125.163.0/24',
+ 'scope' => 'public',
+ 'site' => 'cbv4',
+ 'tag' => '42',
+ 'type' => 'network',
+ },
'vlan-pfds-int' => {
'network' => '10.2.0.0/16',
'scope' => 'private',
@@ -1050,7 +1059,8 @@
'39' => 'vlan-pfds-int',
'40' => 'vlan-pfds-ext',
'372' => 'vlan-middledsi',
- '13' => 'vlan-systeme'
+ '13' => 'vlan-systeme',
+ '42' => 'vlan-public',
},
'BY_NAME' => {
'vlan-admindsi' => {
@@ -1095,13 +1105,21 @@
'netmask' => '255.255.255.0',
'scope' => 'public',
},
+ 'vlan-public' => {
+ 'comment' => 'a vlan available everywhere',
+ 'network' => '80.125.163.0',
+ 'netmask' => '255.255.255.0',
+ 'scope' => 'public',
+ 'tag' => '42',
+ },
},
'BY_ADDR' => {
'192.168.1.0/24' => 'vlan-pfds-ext',
'10.3.2.0/24' => 'vlan-middledsi',
'10.1.0.0/16' => 'vlan-systeme',
'10.3.1.0/24' => 'vlan-admindsi',
- '10.2.0.0/16' => 'vlan-pfds-int'
+ '10.2.0.0/16' => 'vlan-pfds-int',
+ '80.125.163.0/24'=> 'vlan-public',
}
},
'type' => 'site'
@@ -1192,6 +1210,8 @@
'BY_ADDR' => {
'10.1.167.0/16' => 'cbv4-rdeploy00.vlan-systeme',
'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',
},
'BY_MAC' => {
'00:1e:c9:ff:42:0b' =>
@@ -1218,6 +1238,7 @@
'BY_TAG' => {
'13' => 'vlan-systeme',
'40' => 'vlan-pfds-ext',
+ '42' => 'vlan-public',
},
'BY_NAME' => {
'vlan-systeme' => {},
@@ -1229,10 +1250,18 @@
'netmask' => '255.255.255.0',
'scope' => 'public',
},
+ 'vlan-public' => {
+ 'comment' => 'a vlan available everywhere',
+ 'network' => '80.125.163.0',
+ 'netmask' => '255.255.255.0',
+ 'scope' => 'public',
+ 'tag' => '42',
+ },
},
'BY_ADDR' => {
'10.1.0.0/16' => 'vlan-systeme',
- '192.168.1.0/24' => 'vlan-pfds-ext'
+ '192.168.1.0/24' => 'vlan-pfds-ext',
+ '80.125.163.0/24'=> 'vlan-public',
}
},
'type' => 'site'
@@ -1250,8 +1279,10 @@
'__hostclass_order' => [
'vip-spawn',
'cbv4-spawn',
+ 'cbv4-rdeploy',
],
'__network_order' => [
+ 'vlan-public',
'vlan-pfds-ext',
],
'cbv4-spawn' => {
@@ -1268,6 +1299,16 @@
'gateway' => 'A 192.168.1.254',
'netmask' => 'A 255.255.255.0',
},
+ 'vlan-public' => {
+ 'comment' => 'a vlan available everywhere',
+ 'broadcast' => 'A 80.125.163.255',
+ 'network' => 'A 80.125.163.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',
+ },
},
'BY_SITE' => {
'cbv4-pfds' => {
@@ -1418,6 +1459,10 @@
'cbv4-spawn01' => 'cbv4-pfds',
'vip-spawn' => 'cbv4-pfds'
},
+ 'vlan-public' => {
+ 'cbv4-rdeploy00' => 'cbv4',
+ 'cbv4-rdeploy01' => 'cbv4',
+ },
}
};
$expected_configuration->{'SITE'}{'BY_NAME'}{'cbv4'}{'NETWORK'}{'BY_NAME'}
@@ -1915,7 +1960,9 @@
],
'BY_ADDR' => {
'10.1.167.0/16' => 'cbv4-rdeploy00.vlan-systeme',
- '10.1.167.1/16' => 'cbv4-rdeploy01.vlan-systeme'
+ '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',
},
'BY_MAC' => {
'00:1e:c9:ff:42:0b' => 'eth0.cbv4-rdeploy01.vlan-systeme',
@@ -1940,6 +1987,7 @@
'BY_TAG' => {
'13' => 'vlan-systeme',
'40' => 'vlan-pfds-ext',
+ '42' => 'vlan-public',
},
'BY_NAME' => {
'vlan-systeme' => {
@@ -1956,10 +2004,18 @@
'netmask' => '255.255.255.0',
'scope' => 'public'
},
+ 'vlan-public' => {
+ 'comment' => 'a vlan available everywhere',
+ 'network' => '80.125.163.0',
+ 'netmask' => '255.255.255.0',
+ 'scope' => 'public',
+ 'tag' => '42',
+ },
},
'BY_ADDR' => {
'10.1.0.0/16' => 'vlan-systeme',
'192.168.1.0/24' => 'vlan-pfds-ext',
+ '80.125.163.0/24' => 'vlan-public',
}
},
'type' => 'site'
diff -r 2d8d0d805bcc -r 1af4f9bb4d64 t/20.files.t
--- a/t/20.files.t Fri Apr 04 17:05:18 2014 +0200
+++ b/t/20.files.t Fri Apr 04 18:09:15 2014 +0200
@@ -154,6 +154,12 @@
qq{broadcast.vlan-middledsi\tIN A\t10.3.2.255},
qq{gateway.vlan-middledsi\tIN A\t10.3.2.254},
q{},
+ q{; vlan-public: a vlan available everywhere},
+ q{;----------------------------------------------------------------------------},
+ qq{network.vlan-public\tIN A\t80.125.163.0},
+ qq{netmask.vlan-public\tIN A\t255.255.255.0},
+ qq{broadcast.vlan-public\tIN A\t80.125.163.255},
+ q{},
q{; vlan-pfds-ext: something really interesting},
q{;----------------------------------------------------------------------------},
qq{network.vlan-pfds-ext\tIN A\t192.168.1.0},
@@ -207,6 +213,11 @@
qq{spawn00\tIN CNAME\tcbv4-spawn00.vlan-systeme},
qq{spawn01\tIN CNAME\tcbv4-spawn01.vlan-systeme},
q{},
+ q{; cbv4-rdeploy},
+ q{;----------------------------------------------------------------------------},
+ qq{cbv4-rdeploy00.vlan-public\tIN A\t80.125.163.42},
+ qq{cbv4-rdeploy01.vlan-public\tIN A\t80.125.163.43},
+ q{},
q{},
];
More information about the pf-tools-commits
mailing list