From 38e5930a08169b052536cf92f5d2476f54b33d65 Mon Sep 17 00:00:00 2001 From: Jerome Pansanel Date: Fri, 27 Mar 2015 07:28:06 +0100 Subject: [PATCH] Use the new namespace for CPU --- sites/example/hardware/machine/200/48/Dell2/32.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/33.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/34.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/35.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/36.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/37.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/38.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/39.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/40.pan | 4 ++-- sites/example/hardware/machine/200/48/Dell2/41.pan | 4 ++-- sites/example/hardware/machine/200/49/Hp1/34.pan | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/sites/example/hardware/machine/200/48/Dell2/32.pan b/sites/example/hardware/machine/200/48/Dell2/32.pan index aefadfd..0ca05df 100644 --- a/sites/example/hardware/machine/200/48/Dell2/32.pan +++ b/sites/example/hardware/machine/200/48/Dell2/32.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/32; "location" = "200/48/Dell2/32"; "serialnumber" = "DPVTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/33.pan b/sites/example/hardware/machine/200/48/Dell2/33.pan index b3e4f7a..0ed4b17 100644 --- a/sites/example/hardware/machine/200/48/Dell2/33.pan +++ b/sites/example/hardware/machine/200/48/Dell2/33.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/33; "location" = "200/48/Dell2/33"; "serialnumber" = "BPVTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/34.pan b/sites/example/hardware/machine/200/48/Dell2/34.pan index d7f910e..a3c7fc9 100644 --- a/sites/example/hardware/machine/200/48/Dell2/34.pan +++ b/sites/example/hardware/machine/200/48/Dell2/34.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/34; "location" = "200/48/Dell2/34"; "serialnumber" = "4RTTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/35.pan b/sites/example/hardware/machine/200/48/Dell2/35.pan index c4e0bcf..399f8b8 100644 --- a/sites/example/hardware/machine/200/48/Dell2/35.pan +++ b/sites/example/hardware/machine/200/48/Dell2/35.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/35; "location" = "200/48/Dell2/35"; "serialnumber" = "4PVTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/36.pan b/sites/example/hardware/machine/200/48/Dell2/36.pan index c982c63..5f920ec 100644 --- a/sites/example/hardware/machine/200/48/Dell2/36.pan +++ b/sites/example/hardware/machine/200/48/Dell2/36.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/36; "location" = "200/48/Dell2/36"; "serialnumber" = "JNVTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/37.pan b/sites/example/hardware/machine/200/48/Dell2/37.pan index ddd48f5..ddb38a7 100644 --- a/sites/example/hardware/machine/200/48/Dell2/37.pan +++ b/sites/example/hardware/machine/200/48/Dell2/37.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/37; "location" = "200/48/Dell2/37"; "serialnumber" = "7PVTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/38.pan b/sites/example/hardware/machine/200/48/Dell2/38.pan index aec9d6f..fd8d3fd 100644 --- a/sites/example/hardware/machine/200/48/Dell2/38.pan +++ b/sites/example/hardware/machine/200/48/Dell2/38.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/38; "location" = "200/48/Dell2/38"; "serialnumber" = "7RTTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/39.pan b/sites/example/hardware/machine/200/48/Dell2/39.pan index e43931e..fcb5e24 100644 --- a/sites/example/hardware/machine/200/48/Dell2/39.pan +++ b/sites/example/hardware/machine/200/48/Dell2/39.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/39; "location" = "200/48/Dell2/39"; "serialnumber" = "9RTTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/40.pan b/sites/example/hardware/machine/200/48/Dell2/40.pan index dabdd46..2ab80d0 100644 --- a/sites/example/hardware/machine/200/48/Dell2/40.pan +++ b/sites/example/hardware/machine/200/48/Dell2/40.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/40; "location" = "200/48/Dell2/40"; "serialnumber" = "6RTTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/48/Dell2/41.pan b/sites/example/hardware/machine/200/48/Dell2/41.pan index 08c691c..0e6ef2e 100644 --- a/sites/example/hardware/machine/200/48/Dell2/41.pan +++ b/sites/example/hardware/machine/200/48/Dell2/41.pan @@ -9,8 +9,8 @@ structure template hardware/machine/200/48/Dell2/41; "location" = "200/48/Dell2/41"; "serialnumber" = "8RTTL2J"; -"cpu" = list(create("hardware/cpu/intel_xeon_E5140"), - create("hardware/cpu/intel_xeon_E5140")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5140"), + create("hardware/cpu/intel/xeon_E5140")); "harddisks" = nlist("sda", create("hardware/harddisk/sata", "capacity", 80*GB)); diff --git a/sites/example/hardware/machine/200/49/Hp1/34.pan b/sites/example/hardware/machine/200/49/Hp1/34.pan index f560195..16582c1 100644 --- a/sites/example/hardware/machine/200/49/Hp1/34.pan +++ b/sites/example/hardware/machine/200/49/Hp1/34.pan @@ -5,8 +5,8 @@ structure template hardware/machine/200/49/Hp1/34; # 'cpu' describes sockets, number of cores per socket is an attribute of # the CPU description. -"cpu" = list(create("hardware/cpu/intel_xeon_E5420"), - create("hardware/cpu/intel_xeon_E5420")); +"cpu" = list(create("hardware/cpu/intel/xeon_E5420"), + create("hardware/cpu/intel/xeon_E5420")); "harddisks" = nlist("hda", create("hardware/harddisk/ide", "capacity", 40*GB));