commit 2ac96ab7f547c78e952f2f682897e4cb4259d80f Author: Jiri Pirko jiri@resnulli.us Date: Thu Aug 23 10:06:03 2012 +0200
recipes: team: use general netconfig unrelated to actual host
Signed-off-by: Jiri Pirko jiri@resnulli.us
...fig-test1_002.xml => netconfig-team_ab_001.xml} | 2 +- ...tconfig-test1_001.xml => netconfig-team_rr.xml} | 2 +- recipes/team/netconfig-test2_001.xml | 20 ---------- recipes/team/netconfig-test2_002.xml | 38 -------------------- recipes/team/recipe_001.xml | 10 ++++- recipes/team/recipe_002.xml | 10 ++++- 6 files changed, 18 insertions(+), 64 deletions(-) --- diff --git a/recipes/team/netconfig-test1_002.xml b/recipes/team/netconfig-team_ab_001.xml similarity index 95% rename from recipes/team/netconfig-test1_002.xml rename to recipes/team/netconfig-team_ab_001.xml index 3dbf67d..d3ed392 100644 --- a/recipes/team/netconfig-test1_002.xml +++ b/recipes/team/netconfig-team_ab_001.xml @@ -32,7 +32,7 @@ <slave id="2"/> </slaves> <addresses> - <address value="192.168.111.1/24"/> + <address value="{$testip}"/> </addresses> </interface> </netconfig> diff --git a/recipes/team/netconfig-test1_001.xml b/recipes/team/netconfig-team_rr.xml similarity index 90% rename from recipes/team/netconfig-test1_001.xml rename to recipes/team/netconfig-team_rr.xml index 6d12db0..4dd0a9f 100644 --- a/recipes/team/netconfig-test1_001.xml +++ b/recipes/team/netconfig-team_rr.xml @@ -14,7 +14,7 @@ <slave id="2"/> </slaves> <addresses> - <address value="192.168.111.1/24"/> + <address value="{$testip}"/> </addresses> </interface> </netconfig> diff --git a/recipes/team/recipe_001.xml b/recipes/team/recipe_001.xml index 50276e3..ef2f9e7 100644 --- a/recipes/team/recipe_001.xml +++ b/recipes/team/recipe_001.xml @@ -1,12 +1,18 @@ <nettestrecipe> <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + </define> <machine id="1"> <netmachineconfig source="netmachineconfig-test1.xml"/> - <netconfig source="netconfig-test1_001.xml"/> + <netconfig source="netconfig-team_rr.xml"/> </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + </define> <machine id="2"> <netmachineconfig source="netmachineconfig-test2.xml"/> - <netconfig source="netconfig-test2_001.xml"/> + <netconfig source="netconfig-team_rr.xml"/> </machine> </machines> <command_sequence source="sequence_ping_simple.xml"/> diff --git a/recipes/team/recipe_002.xml b/recipes/team/recipe_002.xml index ebb250d..232df3b 100644 --- a/recipes/team/recipe_002.xml +++ b/recipes/team/recipe_002.xml @@ -1,12 +1,18 @@ <nettestrecipe> <machines> + <define> + <alias name="testip" value="192.168.111.1/24"/> + </define> <machine id="1"> <netmachineconfig source="netmachineconfig-test1.xml"/> - <netconfig source="netconfig-test1_002.xml"/> + <netconfig source="netconfig-team_ab_001.xml"/> </machine> + <define> + <alias name="testip" value="192.168.111.2/24"/> + </define> <machine id="2"> <netmachineconfig source="netmachineconfig-test2.xml"/> - <netconfig source="netconfig-test2_002.xml"/> + <netconfig source="netconfig-team_ab_001.xml"/> </machine> </machines> <command_sequence source="sequence_ping_simple.xml"/>
lnst-developers@lists.fedorahosted.org