Skip to content

Commit 6e6cbf1

Browse files
gondorgondor
committed
Merge pull request #508 from iviireczech/volume-metadata
Add Sample metadata init
2 parents 8afc135 + f896ebf commit 6e6cbf1

File tree

3 files changed

+161
-1
lines changed

3 files changed

+161
-1
lines changed

‎core-test/src/main/java/org/openstack4j/api/telemetry/SampleTests.java

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package org.openstack4j.api.telemetry;
2+
3+
import org.openstack4j.api.AbstractTest;
4+
import org.openstack4j.model.telemetry.Event;
5+
import org.openstack4j.model.telemetry.Sample;
6+
import org.openstack4j.model.telemetry.Trait;
7+
import org.testng.annotations.Test;
8+
9+
import java.io.IOException;
10+
import java.util.List;
11+
12+
import static org.testng.Assert.assertEquals;
13+
import static org.testng.Assert.assertNotNull;
14+
15+
@Test(suiteName="Sample Tests")
16+
public class SampleTests extends AbstractTest {
17+
18+
private static final String JSON_SAMPLES = "/telemetry/samples.json";
19+
20+
@Override
21+
protected Service service() {
22+
return Service.TELEMETRY;
23+
}
24+
25+
@Test
26+
public void listTest() throws IOException {
27+
respondWith(JSON_SAMPLES);
28+
29+
List<? extends Sample> samples = os().telemetry().meters().samples("cpu");
30+
assertEquals(samples.size(), 3);
31+
32+
Sample sample = samples.get(0);
33+
assertEquals(sample.getCounterName(), "cpu");
34+
assertNotNull(sample.getMetadata());
35+
assertEquals(sample.getMetadata().size(), 26);
36+
37+
}
38+
39+
}

‎core-test/src/main/resources/telemetry/samples.json

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
[
2+
{
3+
"counter_name": "cpu",
4+
"user_id": "c9ecb6ecf09045e5bbf5f223492e63a0",
5+
"resource_id": "95f30eea-0d6b-4de5-a71f-bf27ab74d1eb",
6+
"timestamp": "2015-11-13T00:56:08",
7+
"recorded_at": "2015-11-13T00:56:08.394081",
8+
"message_id": "531e2408-89a1-11e5-9d10-080027fe75d2",
9+
"source": "openstack",
10+
"counter_unit": "ns",
11+
"counter_volume": 107830000000.0,
12+
"project_id": "78d58a27e48e46678b70cd2448141de2",
13+
"resource_metadata": {
14+
"ephemeral_gb": "0",
15+
"flavor.vcpus": "1",
16+
"OS-EXT-AZ.availability_zone": "nova",
17+
"display_name": "test",
18+
"flavor.ram": "64",
19+
"status": "active",
20+
"ramdisk_id": "59b8ec22-26b9-4111-aab6-a51a094ea6c1",
21+
"flavor.name": "m1.nano",
22+
"disk_gb": "0",
23+
"kernel_id": "db41e262-294f-41bc-bcef-e37cc8bcaafa",
24+
"image.id": "150be85f-6dd3-4c91-af18-197735fa498c",
25+
"flavor.id": "42",
26+
"host": "ba714ffcdd167996d70f4dbfdd81e714c251d9baa486a028229d763e",
27+
"flavor.ephemeral": "0",
28+
"image.name": "cirros-0.3.4-x86_64-uec",
29+
"image_ref_url": "http://192.168.56.101:8774/8d1885c3cc7c41e98816b98d3240388f/images/150be85f-6dd3-4c91-af18-197735fa498c",
30+
"name": "instance-00000009",
31+
"cpu_number": "1",
32+
"flavor.disk": "0",
33+
"root_gb": "0",
34+
"image.links": "[{'href': 'http://192.168.56.101:8774/8d1885c3cc7c41e98816b98d3240388f/images/150be85f-6dd3-4c91-af18-197735fa498c', 'rel': 'bookmark'}]",
35+
"memory_mb": "64",
36+
"instance_type": "m1.nano",
37+
"vcpus": "1",
38+
"image_ref": "150be85f-6dd3-4c91-af18-197735fa498c",
39+
"flavor.links": "[{'href': 'http://192.168.56.101:8774/8d1885c3cc7c41e98816b98d3240388f/flavors/42', 'rel': 'bookmark'}]"
40+
},
41+
"counter_type": "cumulative"
42+
},
43+
{
44+
"counter_name": "cpu",
45+
"user_id": "a214ef1246a044ab876100fc0b5d9f25",
46+
"resource_id": "ad5a3906-4ac3-4b32-abb0-237171d11048",
47+
"timestamp": "2015-11-13T00:56:08",
48+
"recorded_at": "2015-11-13T00:56:08.498232",
49+
"message_id": "53215628-89a1-11e5-9d10-080027fe75d2",
50+
"source": "openstack",
51+
"counter_unit": "ns",
52+
"counter_volume": 0.0,
53+
"project_id": "9e25eb031b8d43e5aac3686b8e7696c6",
54+
"resource_metadata": {
55+
"image": "None",
56+
"ramdisk_id": "None",
57+
"flavor.vcpus": "1",
58+
"OS-EXT-AZ.availability_zone": "nova",
59+
"display_name": "boot_from_volume_snapshot",
60+
"flavor.ram": "64",
61+
"status": "shutoff",
62+
"ephemeral_gb": "0",
63+
"flavor.name": "m1.nano",
64+
"disk_gb": "0",
65+
"kernel_id": "None",
66+
"flavor.id": "42",
67+
"host": "205abadfcd65817185f9fb0f7123c58541ffae645b2221df08c32ebe",
68+
"flavor.ephemeral": "0",
69+
"image_ref_url": "None",
70+
"cpu_number": "1",
71+
"flavor.disk": "0",
72+
"root_gb": "0",
73+
"name": "instance-00000007",
74+
"memory_mb": "64",
75+
"instance_type": "m1.nano",
76+
"vcpus": "1",
77+
"image_ref": "None",
78+
"flavor.links": "[{'href': 'http://192.168.56.101:8774/8d1885c3cc7c41e98816b98d3240388f/flavors/42', 'rel': 'bookmark'}]"
79+
},
80+
"counter_type": "cumulative"
81+
},
82+
{
83+
"counter_name": "cpu",
84+
"user_id": "a214ef1246a044ab876100fc0b5d9f25",
85+
"resource_id": "16922c74-0b2d-437b-ac54-7f1d5582d078",
86+
"timestamp": "2015-11-13T00:56:08",
87+
"recorded_at": "2015-11-13T00:56:08.578034",
88+
"message_id": "5323838a-89a1-11e5-9d10-080027fe75d2",
89+
"source": "openstack",
90+
"counter_unit": "ns",
91+
"counter_volume": 206270000000.0,
92+
"project_id": "9e25eb031b8d43e5aac3686b8e7696c6",
93+
"resource_metadata": {
94+
"image": "None",
95+
"ramdisk_id": "None",
96+
"flavor.vcpus": "1",
97+
"OS-EXT-AZ.availability_zone": "nova",
98+
"display_name": "boot_from_volume",
99+
"flavor.ram": "64",
100+
"status": "active",
101+
"ephemeral_gb": "0",
102+
"flavor.name": "m1.nano",
103+
"disk_gb": "0",
104+
"kernel_id": "None",
105+
"flavor.id": "42",
106+
"host": "205abadfcd65817185f9fb0f7123c58541ffae645b2221df08c32ebe",
107+
"flavor.ephemeral": "0",
108+
"image_ref_url": "None",
109+
"cpu_number": "1",
110+
"flavor.disk": "0",
111+
"root_gb": "0",
112+
"name": "instance-00000006",
113+
"memory_mb": "64",
114+
"instance_type": "m1.nano",
115+
"vcpus": "1",
116+
"image_ref": "None",
117+
"flavor.links": "[{'href': 'http://192.168.56.101:8774/8d1885c3cc7c41e98816b98d3240388f/flavors/42', 'rel': 'bookmark'}]"
118+
},
119+
"counter_type": "cumulative"
120+
}
121+
]

‎core/src/main/java/org/openstack4j/openstack/telemetry/domain/CeilometerSample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,6 @@ public void setMessageId(String messageId) {
221221

222222
@Override
223223
public void setMetadata(Map<String, Object> metadata) {
224-
// TODO Auto-generated method stub
224+
this.metadata = metadata;
225225
}
226226
}

0 commit comments

Comments
 (0)