Skip to content

Commit

Permalink
Merge pull request #22 from Pansanel/proc
Browse files Browse the repository at this point in the history 
Use the new namespace for CPU
  • Loading branch information
@jrha
jrha committed Mar 30, 2015
2 parents d0bbb5f + 38e5930 commit f39fba8
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/32.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/33.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/34.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/35.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/36.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/37.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/38.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/39.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/40.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/48/Dell2/41.pan
View file
Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions sites/example/hardware/machine/200/49/Hp1/34.pan
View file
Expand Up @@ -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));

Expand Down

0 comments on commit f39fba8

Please sign in to comment.