oneacct-export 0.2.7 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (92) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +2 -0
  3. data/.rspec +1 -0
  4. data/.travis.yml +1 -21
  5. data/bin/oneacct-export +7 -6
  6. data/config/conf.yml +25 -7
  7. data/lib/data_validators/apel_data_validator.rb +99 -0
  8. data/lib/data_validators/data_compute.rb +57 -0
  9. data/lib/data_validators/data_validator.rb +12 -0
  10. data/lib/data_validators/data_validator_helper.rb +15 -0
  11. data/lib/data_validators/logstash_data_validator.rb +82 -0
  12. data/lib/data_validators/pbs_data_validator.rb +86 -0
  13. data/lib/errors/not_implemented_error.rb +3 -0
  14. data/lib/errors/validation_error.rb +3 -0
  15. data/lib/errors.rb +2 -0
  16. data/lib/input_validator.rb +12 -2
  17. data/lib/one_data_accessor.rb +11 -10
  18. data/lib/one_worker.rb +109 -137
  19. data/lib/oneacct_exporter/version.rb +1 -1
  20. data/lib/oneacct_exporter.rb +9 -7
  21. data/lib/oneacct_opts.rb +36 -13
  22. data/lib/output_types.rb +5 -0
  23. data/lib/redis_conf.rb +2 -2
  24. data/lib/settings.rb +3 -3
  25. data/lib/templates/apel-0.2.erb +6 -6
  26. data/lib/templates/logstash-0.1.erb +3 -0
  27. data/lib/templates/pbs-0.1.erb +6 -0
  28. data/mock/{one_worker_vm8.xml → one_worker_vm_dn01.xml} +76 -74
  29. data/mock/one_worker_vm_dn02.xml +174 -0
  30. data/mock/{one_worker_DISK_missing.xml → one_worker_vm_empty_disk_records.xml} +10 -6
  31. data/mock/one_worker_vm_empty_history_records.xml +131 -0
  32. data/mock/one_worker_vm_image_name01.xml +175 -0
  33. data/mock/{one_worker_valid_machine.xml → one_worker_vm_image_name02.xml} +35 -7
  34. data/mock/one_worker_vm_image_name03.xml +167 -0
  35. data/mock/{one_worker_vm2.xml → one_worker_vm_image_name04.xml} +38 -9
  36. data/mock/{one_worker_vm1.xml → one_worker_vm_image_name05.xml} +36 -8
  37. data/mock/{one_worker_vm9.xml → one_worker_vm_image_name06.xml} +8 -5
  38. data/oneacct-export.gemspec +1 -0
  39. data/spec/data_validators/apel_data_validator_spec.rb +497 -0
  40. data/spec/data_validators/data_compute_spec.rb +193 -0
  41. data/spec/data_validators/data_validator_helper_spec.rb +66 -0
  42. data/spec/data_validators/data_validator_spec.rb +14 -0
  43. data/spec/data_validators/logstash_data_validator_spec.rb +469 -0
  44. data/spec/data_validators/pbs_data_validator_spec.rb +353 -0
  45. data/spec/one_worker_spec.rb +234 -542
  46. data/spec/oneacct_exporter_spec.rb +1 -41
  47. data/spec/oneacct_opts_spec.rb +135 -32
  48. data/spec/spec_helper.rb +18 -1
  49. metadata +51 -52
  50. data/mock/one_worker_DEPLOY_ID_missing.xml +0 -136
  51. data/mock/one_worker_DISK_SIZE_nan.xml +0 -147
  52. data/mock/one_worker_ETIME_0.xml +0 -137
  53. data/mock/one_worker_ETIME_missing.xml +0 -136
  54. data/mock/one_worker_ETIME_nan.xml +0 -137
  55. data/mock/one_worker_GID_missing.xml +0 -136
  56. data/mock/one_worker_GNAME_missing.xml +0 -136
  57. data/mock/one_worker_HISTORY_RECORDS_missing.xml +0 -91
  58. data/mock/one_worker_HISTORY_many.xml +0 -137
  59. data/mock/one_worker_HISTORY_missing.xml +0 -93
  60. data/mock/one_worker_HISTORY_one.xml +0 -115
  61. data/mock/one_worker_IMAGE_ID_missing.xml +0 -136
  62. data/mock/one_worker_MEMORY_0.xml +0 -137
  63. data/mock/one_worker_MEMORY_missing.xml +0 -135
  64. data/mock/one_worker_MEMORY_nan.xml +0 -137
  65. data/mock/one_worker_NET_RX_0.xml +0 -137
  66. data/mock/one_worker_NET_RX_missing.xml +0 -136
  67. data/mock/one_worker_NET_RX_nan.xml +0 -137
  68. data/mock/one_worker_NET_TX_0.xml +0 -137
  69. data/mock/one_worker_NET_TX_missing.xml +0 -136
  70. data/mock/one_worker_NET_TX_nan.xml +0 -137
  71. data/mock/one_worker_RETIME_0_RUNNING.xml +0 -115
  72. data/mock/one_worker_RETIME_0_STOPPED.xml +0 -115
  73. data/mock/one_worker_RETIME_missing.xml +0 -114
  74. data/mock/one_worker_RSTIME_0.xml +0 -115
  75. data/mock/one_worker_RSTIME_>_RETIME.xml +0 -115
  76. data/mock/one_worker_RSTIME_missing.xml +0 -114
  77. data/mock/one_worker_STATE_missing.xml +0 -136
  78. data/mock/one_worker_STATE_out_of_range.xml +0 -137
  79. data/mock/one_worker_STIME_>_ETIME.xml +0 -137
  80. data/mock/one_worker_STIME_missing.xml +0 -136
  81. data/mock/one_worker_STIME_nan.xml +0 -137
  82. data/mock/one_worker_TEMPLATE_missing.xml +0 -79
  83. data/mock/one_worker_UID_missing.xml +0 -136
  84. data/mock/one_worker_VCPU_0.xml +0 -137
  85. data/mock/one_worker_VCPU_missing.xml +0 -136
  86. data/mock/one_worker_VCPU_nan.xml +0 -137
  87. data/mock/one_worker_malformed_vm.xml +0 -136
  88. data/mock/one_worker_vm3.xml +0 -137
  89. data/mock/one_worker_vm4.xml +0 -106
  90. data/mock/one_worker_vm5.xml +0 -106
  91. data/mock/one_worker_vm6.xml +0 -107
  92. data/mock/one_worker_vm7.xml +0 -147
data/mock/one_worker_vm_image_name01.xml ADDED
@@ -0,0 +1,175 @@
1
+ <VM>
2
+ <ID>36551</ID>
3
+ <UID>120</UID>
4
+ <GID>0</GID>
5
+ <UNAME>uname</UNAME>
6
+ <GNAME>gname</GNAME>
7
+ <NAME>one-36551</NAME>
8
+ <PERMISSIONS>
9
+ <OWNER_U>1</OWNER_U>
10
+ <OWNER_M>1</OWNER_M>
11
+ <OWNER_A>0</OWNER_A>
12
+ <GROUP_U>0</GROUP_U>
13
+ <GROUP_M>0</GROUP_M>
14
+ <GROUP_A>0</GROUP_A>
15
+ <OTHER_U>0</OTHER_U>
16
+ <OTHER_M>0</OTHER_M>
17
+ <OTHER_A>0</OTHER_A>
18
+ </PERMISSIONS>
19
+ <LAST_POLL>1383741679</LAST_POLL>
20
+ <STATE>6</STATE>
21
+ <LCM_STATE>0</LCM_STATE>
22
+ <RESCHED>0</RESCHED>
23
+ <STIME>1383741160</STIME>
24
+ <ETIME>1383742270</ETIME>
25
+ <DEPLOY_ID>one-36551</DEPLOY_ID>
26
+ <MEMORY>1736960</MEMORY>
27
+ <CPU>0</CPU>
28
+ <NET_TX>43557888</NET_TX>
29
+ <NET_RX>376832</NET_RX>
30
+ <TEMPLATE>
31
+ <CONTEXT>
32
+ <DISK_ID><![CDATA[1]]></DISK_ID>
33
+ <FILES><![CDATA[https://somewhere.com/init.sh]]></FILES>
34
+ <HOSTNAME><![CDATA[DebianVM]]></HOSTNAME>
35
+ <PUBLIC_IP><![CDATA[123.123.5.5]]></PUBLIC_IP>
36
+ <SSH_KEY><![CDATA[ssh-rsa AAAAB3NzaC1yc2EAAAADAQABasdgsdfhfgjhxhcHPNFthrHT5/+9lfrQCorJy5YjMJEGBC22dfgjghkDjSDFgjdhgKd54645dfJKd39LdlyzlEaCnjGUeD4C6tZdAISLSDfghSDFgSJ54sSFGJ5RTHARJIRJcX8QRVH46Zq02AeTgrty567ss34tqaa8Pt user@machine1.somewhere.com]]></SSH_KEY>
37
+ <TARGET><![CDATA[xvdb]]></TARGET>
38
+ </CONTEXT>
39
+ <CPU><![CDATA[0.5]]></CPU>
40
+ <DISK>
41
+ <CLONE><![CDATA[YES]]></CLONE>
42
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
43
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
44
+ <DATASTORE><![CDATA[default]]></DATASTORE>
45
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
46
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
47
+ <DISK_ID><![CDATA[0]]></DISK_ID>
48
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
49
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
50
+ <IMAGE_ID><![CDATA[31]]></IMAGE_ID>
51
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
52
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
53
+ <READONLY><![CDATA[NO]]></READONLY>
54
+ <SAVE><![CDATA[NO]]></SAVE>
55
+ <SIZE><![CDATA[10240]]></SIZE>
56
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
57
+ <TARGET><![CDATA[xvda]]></TARGET>
58
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
59
+ <TYPE><![CDATA[FILE]]></TYPE>
60
+ <VMCATCHER_EVENT_AD_MPURI><![CDATA[https://appdb.egi.eu/store/vo/image/image_name_from_VMCATCHER_EVENT_AD_MPURI_tag/]]></VMCATCHER_EVENT_AD_MPURI>
61
+ <VMCATCHER_EVENT_DC_IDENTIFIER><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></VMCATCHER_EVENT_DC_IDENTIFIER>
62
+ <VMCATCHER_EVENT_HV_VERSION><![CDATA[20141029]]></VMCATCHER_EVENT_HV_VERSION>
63
+ <VMCATCHER_EVENT_IL_DC_IDENTIFIER><![CDATA[76fdee70-8119-5d33-9f40-3c57e1c60df1]]></VMCATCHER_EVENT_IL_DC_IDENTIFIER>
64
+ <VMCATCHER_EVENT_SL_CHECKSUM_SHA512><![CDATA[02a2b436e8f10c22527795c33bf623a1a0ef2e7036166e8831f653c3662f8f897a821f4751d774947e32a854654ff645097c47da236e46ad54806c6fc72a29ce]]></VMCATCHER_EVENT_SL_CHECKSUM_SHA512>
65
+ </DISK>
66
+ <DISK>
67
+ <CLONE><![CDATA[YES]]></CLONE>
68
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
69
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
70
+ <DATASTORE><![CDATA[default]]></DATASTORE>
71
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
72
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
73
+ <DISK_ID><![CDATA[0]]></DISK_ID>
74
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
75
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
76
+ <IMAGE_ID><![CDATA[227]]></IMAGE_ID>
77
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
78
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
79
+ <READONLY><![CDATA[NO]]></READONLY>
80
+ <SAVE><![CDATA[NO]]></SAVE>
81
+ <SIZE><![CDATA[42368]]></SIZE>
82
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
83
+ <TARGET><![CDATA[xvda]]></TARGET>
84
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
85
+ <TYPE><![CDATA[FILE]]></TYPE>
86
+ <VMCATCHER_EVENT_AD_MPURI><![CDATA[https://appdb.egi.eu/store/vo/image/662b0e71-3e21-5f43-b6a1-cc2f51319fa7:156/]]></VMCATCHER_EVENT_AD_MPURI>
87
+ <VMCATCHER_EVENT_DC_IDENTIFIER><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></VMCATCHER_EVENT_DC_IDENTIFIER>
88
+ <VMCATCHER_EVENT_HV_VERSION><![CDATA[20141029]]></VMCATCHER_EVENT_HV_VERSION>
89
+ <VMCATCHER_EVENT_IL_DC_IDENTIFIER><![CDATA[76fdee70-8119-5d33-9f40-3c57e1c60df1]]></VMCATCHER_EVENT_IL_DC_IDENTIFIER>
90
+ <VMCATCHER_EVENT_SL_CHECKSUM_SHA512><![CDATA[02a2b436e8f10c22527795c33bf623a1a0ef2e7036166e8831f653c3662f8f897a821f4751d774947e32a854654ff645097c47da236e46ad54806c6fc72a29ce]]></VMCATCHER_EVENT_SL_CHECKSUM_SHA512>
91
+ </DISK>
92
+ <ERROR>
93
+ <MESSAGE><![CDATA[Error executing image transfer script: Path https://somewhere.com/init.sh is not allowed!]]></MESSAGE>
94
+ <TIMESTAMP><![CDATA[Wed Nov 6 13:34:19 2013]]></TIMESTAMP>
95
+ </ERROR>
96
+ <FEATURES>
97
+ <ACPI><![CDATA[no]]></ACPI>
98
+ </FEATURES>
99
+ <MEMORY>1736960</MEMORY>
100
+ <NAME><![CDATA[one-36551]]></NAME>
101
+ <NIC>
102
+ <BRIDGE><![CDATA[xenbr0]]></BRIDGE>
103
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
104
+ <IP><![CDATA[123.123.5.5]]></IP>
105
+ <MAC><![CDATA[01:23:45:67:89:ab]]></MAC>
106
+ <NETWORK><![CDATA[public]]></NETWORK>
107
+ <NETWORK_ID><![CDATA[4]]></NETWORK_ID>
108
+ <VLAN><![CDATA[NO]]></VLAN>
109
+ <WHITE_PORTS_TCP><![CDATA[22]]></WHITE_PORTS_TCP>
110
+ <WHITE_PORTS_UDP><![CDATA[67,68]]></WHITE_PORTS_UDP>
111
+ </NIC>
112
+ <OS>
113
+ <BOOTLOADER><![CDATA[pygrub]]></BOOTLOADER>
114
+ </OS>
115
+ <RAW>
116
+ <TYPE><![CDATA[xen]]></TYPE>
117
+ </RAW>
118
+ <TEMPLATE_ID><![CDATA[66]]></TEMPLATE_ID>
119
+ <VCPU><![CDATA[1]]></VCPU>
120
+ <VMID><![CDATA[36551]]></VMID>
121
+ </TEMPLATE>
122
+ <USER_TEMPLATE>
123
+ <ARCHITECTURE><![CDATA[x86]]></ARCHITECTURE>
124
+ <DESCRIPTION><![CDATA[Instantiated with rOCCI-server on Wed, 29 Oct 2014 14:01:15 +0100.]]></DESCRIPTION>
125
+ <OCCI_COMPUTE_MIXINS><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#uuid_monitoring_20 http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_COMPUTE_MIXINS>
126
+ <OCCI_ID><![CDATA[46083]]></OCCI_ID>
127
+ <USER_X509_DN><![CDATA[/Dn=FrOm/CN=DN/CN=TeMpLaTe]]></USER_X509_DN>
128
+ </USER_TEMPLATE>
129
+ <HISTORY_RECORDS>
130
+ <HISTORY>
131
+ <OID>36551</OID>
132
+ <SEQ>0</SEQ>
133
+ <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
134
+ <HID>11</HID>
135
+ <CID>100</CID>
136
+ <STIME>1383741169</STIME>
137
+ <ETIME>1383741259</ETIME>
138
+ <VMMMAD>vmm_xen</VMMMAD>
139
+ <VNMMAD>fw</VNMMAD>
140
+ <TMMAD>ssh</TMMAD>
141
+ <DS_LOCATION>/opt/opennebula/var/datastores</DS_LOCATION>
142
+ <DS_ID>0</DS_ID>
143
+ <PSTIME>1383741169</PSTIME>
144
+ <PETIME>1383741259</PETIME>
145
+ <RSTIME>0</RSTIME>
146
+ <RETIME>0</RETIME>
147
+ <ESTIME>0</ESTIME>
148
+ <EETIME>0</EETIME>
149
+ <REASON>1</REASON>
150
+ <ACTION>0</ACTION>
151
+ </HISTORY>
152
+ <HISTORY>
153
+ <OID>36551</OID>
154
+ <SEQ>1</SEQ>
155
+ <HOSTNAME>supermachine2.somewhere.com</HOSTNAME>
156
+ <HID>11</HID>
157
+ <CID>100</CID>
158
+ <STIME>1383741589</STIME>
159
+ <ETIME>1383742270</ETIME>
160
+ <VMMMAD>vmm_xen</VMMMAD>
161
+ <VNMMAD>fw</VNMMAD>
162
+ <TMMAD>ssh</TMMAD>
163
+ <DS_LOCATION>/opt/opennebula/var/datastores</DS_LOCATION>
164
+ <DS_ID>0</DS_ID>
165
+ <PSTIME>1383741589</PSTIME>
166
+ <PETIME>1383741674</PETIME>
167
+ <RSTIME>1383741674</RSTIME>
168
+ <RETIME>1383742270</RETIME>
169
+ <ESTIME>1383742270</ESTIME>
170
+ <EETIME>1383742270</EETIME>
171
+ <REASON>0</REASON>
172
+ <ACTION>0</ACTION>
173
+ </HISTORY>
174
+ </HISTORY_RECORDS>
175
+ </VM>
data/mock/{one_worker_valid_machine.xml → one_worker_vm_image_name02.xml} RENAMED
@@ -38,19 +38,43 @@
38
38
  </CONTEXT>
39
39
  <CPU><![CDATA[0.5]]></CPU>
40
40
  <DISK>
41
- <BUS><![CDATA[ide]]></BUS>
42
41
  <CLONE><![CDATA[YES]]></CLONE>
42
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
43
43
  <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
44
44
  <DATASTORE><![CDATA[default]]></DATASTORE>
45
45
  <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
46
46
  <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
47
47
  <DISK_ID><![CDATA[0]]></DISK_ID>
48
48
  <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
49
- <IMAGE><![CDATA[debian6]]></IMAGE>
49
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
50
50
  <IMAGE_ID><![CDATA[31]]></IMAGE_ID>
51
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
52
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
51
53
  <READONLY><![CDATA[NO]]></READONLY>
52
54
  <SAVE><![CDATA[NO]]></SAVE>
53
- <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/bc8db254875412f417ac745b7d47820]]></SOURCE>
55
+ <SIZE><![CDATA[10240]]></SIZE>
56
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
57
+ <TARGET><![CDATA[xvda]]></TARGET>
58
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
59
+ <TYPE><![CDATA[FILE]]></TYPE>
60
+ </DISK>
61
+ <DISK>
62
+ <CLONE><![CDATA[YES]]></CLONE>
63
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
64
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
65
+ <DATASTORE><![CDATA[default]]></DATASTORE>
66
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
67
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
68
+ <DISK_ID><![CDATA[0]]></DISK_ID>
69
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
70
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
71
+ <IMAGE_ID><![CDATA[227]]></IMAGE_ID>
72
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
73
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
74
+ <READONLY><![CDATA[NO]]></READONLY>
75
+ <SAVE><![CDATA[NO]]></SAVE>
76
+ <SIZE><![CDATA[42368]]></SIZE>
77
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
54
78
  <TARGET><![CDATA[xvda]]></TARGET>
55
79
  <TM_MAD><![CDATA[ssh]]></TM_MAD>
56
80
  <TYPE><![CDATA[FILE]]></TYPE>
@@ -85,9 +109,13 @@
85
109
  <VCPU><![CDATA[1]]></VCPU>
86
110
  <VMID><![CDATA[36551]]></VMID>
87
111
  </TEMPLATE>
88
- <USER_TEMPLATE>
89
- <SCHED_REQUIREMENTS><![CDATA[CLUSTER_ID = 100]]></SCHED_REQUIREMENTS>
90
- </USER_TEMPLATE>
112
+ <USER_TEMPLATE>
113
+ <ARCHITECTURE><![CDATA[x86]]></ARCHITECTURE>
114
+ <DESCRIPTION><![CDATA[Instantiated with rOCCI-server on Wed, 29 Oct 2014 14:01:15 +0100.]]></DESCRIPTION>
115
+ <OCCI_COMPUTE_MIXINS><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#uuid_monitoring_20 http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_COMPUTE_MIXINS>
116
+ <OCCI_ID><![CDATA[46083]]></OCCI_ID>
117
+ <USER_X509_DN><![CDATA[/Dn=FrOm/CN=DN/CN=TeMpLaTe]]></USER_X509_DN>
118
+ </USER_TEMPLATE>
91
119
  <HISTORY_RECORDS>
92
120
  <HISTORY>
93
121
  <OID>36551</OID>
@@ -114,7 +142,7 @@
114
142
  <HISTORY>
115
143
  <OID>36551</OID>
116
144
  <SEQ>1</SEQ>
117
- <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
145
+ <HOSTNAME>supermachine2.somewhere.com</HOSTNAME>
118
146
  <HID>11</HID>
119
147
  <CID>100</CID>
120
148
  <STIME>1383741589</STIME>
data/mock/one_worker_vm_image_name03.xml ADDED
@@ -0,0 +1,167 @@
1
+ <VM>
2
+ <ID>36551</ID>
3
+ <UID>120</UID>
4
+ <GID>0</GID>
5
+ <UNAME>uname</UNAME>
6
+ <GNAME>gname</GNAME>
7
+ <NAME>one-36551</NAME>
8
+ <PERMISSIONS>
9
+ <OWNER_U>1</OWNER_U>
10
+ <OWNER_M>1</OWNER_M>
11
+ <OWNER_A>0</OWNER_A>
12
+ <GROUP_U>0</GROUP_U>
13
+ <GROUP_M>0</GROUP_M>
14
+ <GROUP_A>0</GROUP_A>
15
+ <OTHER_U>0</OTHER_U>
16
+ <OTHER_M>0</OTHER_M>
17
+ <OTHER_A>0</OTHER_A>
18
+ </PERMISSIONS>
19
+ <LAST_POLL>1383741679</LAST_POLL>
20
+ <STATE>6</STATE>
21
+ <LCM_STATE>0</LCM_STATE>
22
+ <RESCHED>0</RESCHED>
23
+ <STIME>1383741160</STIME>
24
+ <ETIME>1383742270</ETIME>
25
+ <DEPLOY_ID>one-36551</DEPLOY_ID>
26
+ <MEMORY>1736960</MEMORY>
27
+ <CPU>0</CPU>
28
+ <NET_TX>43557888</NET_TX>
29
+ <NET_RX>376832</NET_RX>
30
+ <TEMPLATE>
31
+ <CONTEXT>
32
+ <DISK_ID><![CDATA[1]]></DISK_ID>
33
+ <FILES><![CDATA[https://somewhere.com/init.sh]]></FILES>
34
+ <HOSTNAME><![CDATA[DebianVM]]></HOSTNAME>
35
+ <PUBLIC_IP><![CDATA[123.123.5.5]]></PUBLIC_IP>
36
+ <SSH_KEY><![CDATA[ssh-rsa AAAAB3NzaC1yc2EAAAADAQABasdgsdfhfgjhxhcHPNFthrHT5/+9lfrQCorJy5YjMJEGBC22dfgjghkDjSDFgjdhgKd54645dfJKd39LdlyzlEaCnjGUeD4C6tZdAISLSDfghSDFgSJ54sSFGJ5RTHARJIRJcX8QRVH46Zq02AeTgrty567ss34tqaa8Pt user@machine1.somewhere.com]]></SSH_KEY>
37
+ <TARGET><![CDATA[xvdb]]></TARGET>
38
+ </CONTEXT>
39
+ <CPU><![CDATA[0.5]]></CPU>
40
+ <DISK>
41
+ <CLONE><![CDATA[YES]]></CLONE>
42
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
43
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
44
+ <DATASTORE><![CDATA[default]]></DATASTORE>
45
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
46
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
47
+ <DISK_ID><![CDATA[0]]></DISK_ID>
48
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
49
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
50
+ <IMAGE_ID><![CDATA[42]]></IMAGE_ID>
51
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
52
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
53
+ <READONLY><![CDATA[NO]]></READONLY>
54
+ <SAVE><![CDATA[NO]]></SAVE>
55
+ <SIZE><![CDATA[10240]]></SIZE>
56
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
57
+ <TARGET><![CDATA[xvda]]></TARGET>
58
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
59
+ <TYPE><![CDATA[FILE]]></TYPE>
60
+ </DISK>
61
+ <DISK>
62
+ <CLONE><![CDATA[YES]]></CLONE>
63
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
64
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
65
+ <DATASTORE><![CDATA[default]]></DATASTORE>
66
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
67
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
68
+ <DISK_ID><![CDATA[0]]></DISK_ID>
69
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
70
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
71
+ <IMAGE_ID><![CDATA[227]]></IMAGE_ID>
72
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
73
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
74
+ <READONLY><![CDATA[NO]]></READONLY>
75
+ <SAVE><![CDATA[NO]]></SAVE>
76
+ <SIZE><![CDATA[42368]]></SIZE>
77
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
78
+ <TARGET><![CDATA[xvda]]></TARGET>
79
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
80
+ <TYPE><![CDATA[FILE]]></TYPE>
81
+ </DISK>
82
+ <ERROR>
83
+ <MESSAGE><![CDATA[Error executing image transfer script: Path https://somewhere.com/init.sh is not allowed!]]></MESSAGE>
84
+ <TIMESTAMP><![CDATA[Wed Nov 6 13:34:19 2013]]></TIMESTAMP>
85
+ </ERROR>
86
+ <FEATURES>
87
+ <ACPI><![CDATA[no]]></ACPI>
88
+ </FEATURES>
89
+ <MEMORY>1736960</MEMORY>
90
+ <NAME><![CDATA[one-36551]]></NAME>
91
+ <NIC>
92
+ <BRIDGE><![CDATA[xenbr0]]></BRIDGE>
93
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
94
+ <IP><![CDATA[123.123.5.5]]></IP>
95
+ <MAC><![CDATA[01:23:45:67:89:ab]]></MAC>
96
+ <NETWORK><![CDATA[public]]></NETWORK>
97
+ <NETWORK_ID><![CDATA[4]]></NETWORK_ID>
98
+ <VLAN><![CDATA[NO]]></VLAN>
99
+ <WHITE_PORTS_TCP><![CDATA[22]]></WHITE_PORTS_TCP>
100
+ <WHITE_PORTS_UDP><![CDATA[67,68]]></WHITE_PORTS_UDP>
101
+ </NIC>
102
+ <OS>
103
+ <BOOTLOADER><![CDATA[pygrub]]></BOOTLOADER>
104
+ </OS>
105
+ <RAW>
106
+ <TYPE><![CDATA[xen]]></TYPE>
107
+ </RAW>
108
+ <TEMPLATE_ID><![CDATA[66]]></TEMPLATE_ID>
109
+ <VCPU><![CDATA[1]]></VCPU>
110
+ <VMID><![CDATA[36551]]></VMID>
111
+ <OCCI_MIXIN><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#image_name_from_TEMPLATE_OCCI_MIXIN http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_MIXIN>
112
+ </TEMPLATE>
113
+ <USER_TEMPLATE>
114
+ <ARCHITECTURE><![CDATA[x86]]></ARCHITECTURE>
115
+ <DESCRIPTION><![CDATA[Instantiated with rOCCI-server on Wed, 29 Oct 2014 14:01:15 +0100.]]></DESCRIPTION>
116
+ <OCCI_MIXIN><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#image_name_from_USER_TEMPLATE_OCCI_MIXIN http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_MIXIN>
117
+ <OCCI_COMPUTE_MIXINS><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#image_name_from_USER_TEMPLATE_OCCI_COMPUTE_MIXINS http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_COMPUTE_MIXINS>
118
+ <OCCI_ID><![CDATA[46083]]></OCCI_ID>
119
+ <USER_X509_DN><![CDATA[/Dn=FrOm/CN=DN/CN=TeMpLaTe]]></USER_X509_DN>
120
+ </USER_TEMPLATE>
121
+ <HISTORY_RECORDS>
122
+ <HISTORY>
123
+ <OID>36551</OID>
124
+ <SEQ>0</SEQ>
125
+ <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
126
+ <HID>11</HID>
127
+ <CID>100</CID>
128
+ <STIME>1383741169</STIME>
129
+ <ETIME>1383741259</ETIME>
130
+ <VMMMAD>vmm_xen</VMMMAD>
131
+ <VNMMAD>fw</VNMMAD>
132
+ <TMMAD>ssh</TMMAD>
133
+ <DS_LOCATION>/opt/opennebula/var/datastores</DS_LOCATION>
134
+ <DS_ID>0</DS_ID>
135
+ <PSTIME>1383741169</PSTIME>
136
+ <PETIME>1383741259</PETIME>
137
+ <RSTIME>0</RSTIME>
138
+ <RETIME>0</RETIME>
139
+ <ESTIME>0</ESTIME>
140
+ <EETIME>0</EETIME>
141
+ <REASON>1</REASON>
142
+ <ACTION>0</ACTION>
143
+ </HISTORY>
144
+ <HISTORY>
145
+ <OID>36551</OID>
146
+ <SEQ>1</SEQ>
147
+ <HOSTNAME>supermachine2.somewhere.com</HOSTNAME>
148
+ <HID>11</HID>
149
+ <CID>100</CID>
150
+ <STIME>1383741589</STIME>
151
+ <ETIME>1383742270</ETIME>
152
+ <VMMMAD>vmm_xen</VMMMAD>
153
+ <VNMMAD>fw</VNMMAD>
154
+ <TMMAD>ssh</TMMAD>
155
+ <DS_LOCATION>/opt/opennebula/var/datastores</DS_LOCATION>
156
+ <DS_ID>0</DS_ID>
157
+ <PSTIME>1383741589</PSTIME>
158
+ <PETIME>1383741674</PETIME>
159
+ <RSTIME>1383741674</RSTIME>
160
+ <RETIME>1383742270</RETIME>
161
+ <ESTIME>1383742270</ESTIME>
162
+ <EETIME>1383742270</EETIME>
163
+ <REASON>0</REASON>
164
+ <ACTION>0</ACTION>
165
+ </HISTORY>
166
+ </HISTORY_RECORDS>
167
+ </VM>
data/mock/{one_worker_vm2.xml → one_worker_vm_image_name04.xml} RENAMED
@@ -1,5 +1,5 @@
1
1
  <VM>
2
- <ID>36552</ID>
2
+ <ID>36551</ID>
3
3
  <UID>120</UID>
4
4
  <GID>0</GID>
5
5
  <UNAME>uname</UNAME>
@@ -38,19 +38,43 @@
38
38
  </CONTEXT>
39
39
  <CPU><![CDATA[0.5]]></CPU>
40
40
  <DISK>
41
- <BUS><![CDATA[ide]]></BUS>
42
41
  <CLONE><![CDATA[YES]]></CLONE>
42
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
43
43
  <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
44
44
  <DATASTORE><![CDATA[default]]></DATASTORE>
45
45
  <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
46
46
  <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
47
47
  <DISK_ID><![CDATA[0]]></DISK_ID>
48
48
  <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
49
- <IMAGE><![CDATA[debian6]]></IMAGE>
50
- <IMAGE_ID><![CDATA[31]]></IMAGE_ID>
49
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
50
+ <IMAGE_ID><![CDATA[42]]></IMAGE_ID>
51
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
52
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
51
53
  <READONLY><![CDATA[NO]]></READONLY>
52
54
  <SAVE><![CDATA[NO]]></SAVE>
53
- <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/bc8db254875412f417ac745b7d47820]]></SOURCE>
55
+ <SIZE><![CDATA[10240]]></SIZE>
56
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
57
+ <TARGET><![CDATA[xvda]]></TARGET>
58
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
59
+ <TYPE><![CDATA[FILE]]></TYPE>
60
+ </DISK>
61
+ <DISK>
62
+ <CLONE><![CDATA[YES]]></CLONE>
63
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
64
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
65
+ <DATASTORE><![CDATA[default]]></DATASTORE>
66
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
67
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
68
+ <DISK_ID><![CDATA[0]]></DISK_ID>
69
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
70
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
71
+ <IMAGE_ID><![CDATA[227]]></IMAGE_ID>
72
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
73
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
74
+ <READONLY><![CDATA[NO]]></READONLY>
75
+ <SAVE><![CDATA[NO]]></SAVE>
76
+ <SIZE><![CDATA[42368]]></SIZE>
77
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
54
78
  <TARGET><![CDATA[xvda]]></TARGET>
55
79
  <TM_MAD><![CDATA[ssh]]></TM_MAD>
56
80
  <TYPE><![CDATA[FILE]]></TYPE>
@@ -84,10 +108,15 @@
84
108
  <TEMPLATE_ID><![CDATA[66]]></TEMPLATE_ID>
85
109
  <VCPU><![CDATA[1]]></VCPU>
86
110
  <VMID><![CDATA[36551]]></VMID>
111
+ <OCCI_MIXIN><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#image_name_from_TEMPLATE_OCCI_MIXIN http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_MIXIN>
87
112
  </TEMPLATE>
88
- <USER_TEMPLATE>
89
- <SCHED_REQUIREMENTS><![CDATA[CLUSTER_ID = 100]]></SCHED_REQUIREMENTS>
90
- </USER_TEMPLATE>
113
+ <USER_TEMPLATE>
114
+ <ARCHITECTURE><![CDATA[x86]]></ARCHITECTURE>
115
+ <DESCRIPTION><![CDATA[Instantiated with rOCCI-server on Wed, 29 Oct 2014 14:01:15 +0100.]]></DESCRIPTION>
116
+ <OCCI_MIXIN><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#image_name_from_USER_TEMPLATE_OCCI_MIXIN http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_COMPUTE_MIXINS>
117
+ <OCCI_ID><![CDATA[46083]]></OCCI_ID>
118
+ <USER_X509_DN><![CDATA[/Dn=FrOm/CN=DN/CN=TeMpLaTe]]></USER_X509_DN>
119
+ </USER_TEMPLATE>
91
120
  <HISTORY_RECORDS>
92
121
  <HISTORY>
93
122
  <OID>36551</OID>
@@ -114,7 +143,7 @@
114
143
  <HISTORY>
115
144
  <OID>36551</OID>
116
145
  <SEQ>1</SEQ>
117
- <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
146
+ <HOSTNAME>supermachine2.somewhere.com</HOSTNAME>
118
147
  <HID>11</HID>
119
148
  <CID>100</CID>
120
149
  <STIME>1383741589</STIME>
data/mock/{one_worker_vm1.xml → one_worker_vm_image_name05.xml} RENAMED
@@ -38,19 +38,43 @@
38
38
  </CONTEXT>
39
39
  <CPU><![CDATA[0.5]]></CPU>
40
40
  <DISK>
41
- <BUS><![CDATA[ide]]></BUS>
42
41
  <CLONE><![CDATA[YES]]></CLONE>
42
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
43
43
  <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
44
44
  <DATASTORE><![CDATA[default]]></DATASTORE>
45
45
  <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
46
46
  <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
47
47
  <DISK_ID><![CDATA[0]]></DISK_ID>
48
48
  <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
49
- <IMAGE><![CDATA[debian6]]></IMAGE>
50
- <IMAGE_ID><![CDATA[31]]></IMAGE_ID>
49
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
50
+ <IMAGE_ID><![CDATA[42]]></IMAGE_ID>
51
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
52
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
51
53
  <READONLY><![CDATA[NO]]></READONLY>
52
54
  <SAVE><![CDATA[NO]]></SAVE>
53
- <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/bc8db254875412f417ac745b7d47820]]></SOURCE>
55
+ <SIZE><![CDATA[10240]]></SIZE>
56
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
57
+ <TARGET><![CDATA[xvda]]></TARGET>
58
+ <TM_MAD><![CDATA[ssh]]></TM_MAD>
59
+ <TYPE><![CDATA[FILE]]></TYPE>
60
+ </DISK>
61
+ <DISK>
62
+ <CLONE><![CDATA[YES]]></CLONE>
63
+ <CLONE_TARGET><![CDATA[SYSTEM]]></CLONE_TARGET>
64
+ <CLUSTER_ID><![CDATA[100]]></CLUSTER_ID>
65
+ <DATASTORE><![CDATA[default]]></DATASTORE>
66
+ <DATASTORE_ID><![CDATA[1]]></DATASTORE_ID>
67
+ <DEV_PREFIX><![CDATA[xvd]]></DEV_PREFIX>
68
+ <DISK_ID><![CDATA[0]]></DISK_ID>
69
+ <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
70
+ <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
71
+ <IMAGE_ID><![CDATA[227]]></IMAGE_ID>
72
+ <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
73
+ <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
74
+ <READONLY><![CDATA[NO]]></READONLY>
75
+ <SAVE><![CDATA[NO]]></SAVE>
76
+ <SIZE><![CDATA[42368]]></SIZE>
77
+ <SOURCE><![CDATA[/opt/opennebula/var/datastores/1/c516eb23fcb184f1458104a5d66f36b0]]></SOURCE>
54
78
  <TARGET><![CDATA[xvda]]></TARGET>
55
79
  <TM_MAD><![CDATA[ssh]]></TM_MAD>
56
80
  <TYPE><![CDATA[FILE]]></TYPE>
@@ -84,10 +108,14 @@
84
108
  <TEMPLATE_ID><![CDATA[66]]></TEMPLATE_ID>
85
109
  <VCPU><![CDATA[1]]></VCPU>
86
110
  <VMID><![CDATA[36551]]></VMID>
111
+ <OCCI_MIXIN><![CDATA[http://occi.localhost/occi/infrastructure/os_tpl#image_name_from_TEMPLATE_OCCI_MIXIN http://schema.fedcloud.egi.eu/occi/infrastructure/resource_tpl#small http://opennebula.org/occi/infrastructure#compute]]></OCCI_MIXIN>
87
112
  </TEMPLATE>
88
- <USER_TEMPLATE>
89
- <SCHED_REQUIREMENTS><![CDATA[CLUSTER_ID = 100]]></SCHED_REQUIREMENTS>
90
- </USER_TEMPLATE>
113
+ <USER_TEMPLATE>
114
+ <ARCHITECTURE><![CDATA[x86]]></ARCHITECTURE>
115
+ <DESCRIPTION><![CDATA[Instantiated with rOCCI-server on Wed, 29 Oct 2014 14:01:15 +0100.]]></DESCRIPTION>
116
+ <OCCI_ID><![CDATA[46083]]></OCCI_ID>
117
+ <USER_X509_DN><![CDATA[/Dn=FrOm/CN=DN/CN=TeMpLaTe]]></USER_X509_DN>
118
+ </USER_TEMPLATE>
91
119
  <HISTORY_RECORDS>
92
120
  <HISTORY>
93
121
  <OID>36551</OID>
@@ -114,7 +142,7 @@
114
142
  <HISTORY>
115
143
  <OID>36551</OID>
116
144
  <SEQ>1</SEQ>
117
- <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
145
+ <HOSTNAME>supermachine2.somewhere.com</HOSTNAME>
118
146
  <HID>11</HID>
119
147
  <CID>100</CID>
120
148
  <STIME>1383741589</STIME>
data/mock/{one_worker_vm9.xml → one_worker_vm_image_name06.xml} RENAMED
@@ -47,7 +47,7 @@
47
47
  <DISK_ID><![CDATA[0]]></DISK_ID>
48
48
  <DRIVER><![CDATA[tap2:tapdisk:aio:]]></DRIVER>
49
49
  <IMAGE><![CDATA[662b0e71-3e21-5f43-b6a1-cc2f51319fa7]]></IMAGE>
50
- <IMAGE_ID><![CDATA[31]]></IMAGE_ID>
50
+ <IMAGE_ID><![CDATA[42]]></IMAGE_ID>
51
51
  <IMAGE_UNAME><![CDATA[oneadmin]]></IMAGE_UNAME>
52
52
  <LN_TARGET><![CDATA[SYSTEM]]></LN_TARGET>
53
53
  <READONLY><![CDATA[NO]]></READONLY>
@@ -109,9 +109,12 @@
109
109
  <VCPU><![CDATA[1]]></VCPU>
110
110
  <VMID><![CDATA[36551]]></VMID>
111
111
  </TEMPLATE>
112
- <USER_TEMPLATE>
113
- <SCHED_REQUIREMENTS><![CDATA[CLUSTER_ID = 100]]></SCHED_REQUIREMENTS>
114
- </USER_TEMPLATE>
112
+ <USER_TEMPLATE>
113
+ <ARCHITECTURE><![CDATA[x86]]></ARCHITECTURE>
114
+ <DESCRIPTION><![CDATA[Instantiated with rOCCI-server on Wed, 29 Oct 2014 14:01:15 +0100.]]></DESCRIPTION>
115
+ <OCCI_ID><![CDATA[46083]]></OCCI_ID>
116
+ <USER_X509_DN><![CDATA[/Dn=FrOm/CN=DN/CN=TeMpLaTe]]></USER_X509_DN>
117
+ </USER_TEMPLATE>
115
118
  <HISTORY_RECORDS>
116
119
  <HISTORY>
117
120
  <OID>36551</OID>
@@ -138,7 +141,7 @@
138
141
  <HISTORY>
139
142
  <OID>36551</OID>
140
143
  <SEQ>1</SEQ>
141
- <HOSTNAME>supermachine1.somewhere.com</HOSTNAME>
144
+ <HOSTNAME>supermachine2.somewhere.com</HOSTNAME>
142
145
  <HID>11</HID>
143
146
  <CID>100</CID>
144
147
  <STIME>1383741589</STIME>
data/oneacct-export.gemspec CHANGED
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
22
22
  spec.add_development_dependency 'bundler', '~> 1.6'
23
23
  spec.add_development_dependency 'rake', '~> 10.0'
24
24
  spec.add_development_dependency 'rspec', '~> 3.0.0'
25
+ spec.add_development_dependency 'fuubar', '~> 2.0.0'
25
26
  spec.add_development_dependency 'simplecov', '~> 0.9.0'
26
27
  spec.add_development_dependency 'rubygems-tasks', '~> 0.2.4'
27
28