Added method getResourceMetricMeasures, fixed psr2

Author: haphan

src/Metric/v1/Gnocchi/Api.php

@@ -30,11 +30,11 @@ public function getResources(): array
     public function getResource(): array
     {
         return [
-            'path' => $this->pathPrefix.'/resource/{type}/{id}',
+            'path'   => $this->pathPrefix.'/resource/{type}/{id}',
             'method' => 'GET',
             'params' => [
                 'id' => $this->params->idUrl('resource'),
-            ]
+            ],
         ];
     }
 
@@ -82,32 +82,46 @@ public function getMetrics(): array
             'params' => [
                 'limit'  => $this->params->limit(),
                 'marker' => $this->params->marker(),
-                'sort'   => $this->params->sort()
+                'sort'   => $this->params->sort(),
             ],
         ];
     }
 
     public function getResourceMetrics(): array
     {
         return [
-            'path' => $this->pathPrefix.'/resource/generic/{resourceId}/metric',
+            'path'   => $this->pathPrefix.'/resource/generic/{resourceId}/metric',
             'method' => 'GET',
             'params' => [
                 'resourceId' => $this->params->idUrl('metric'),
-            ]
+            ],
         ];
     }
 
     public function getResourceMetric(): array
     {
         return [
-            'path' => $this->pathPrefix.'/resource/{type}/{resourceId}/metric/{metric}',
+            'path'   => $this->pathPrefix.'/resource/{type}/{resourceId}/metric/{metric}',
             'method' => 'GET',
             'params' => [
                 'resourceId' => $this->params->idUrl('resource'),
-                'metric' => $this->params->idUrl('metric'),
-                'type'   => $this->params->resourceType(),
-            ]
+                'metric'     => $this->params->idUrl('metric'),
+                'type'       => $this->params->resourceType(),
+            ],
+        ];
+    }
+
+    public function getResourceMetricMeasures(): array
+    {
+        return [
+            'path'   => $this->pathPrefix.'/resource/{type}/{resourceId}/metric/{metric}/measures',
+            'method' => 'GET',
+            'params' => [
+                'resourceId'  => $this->params->idUrl('resource'),
+                'metric'      => $this->params->idUrl('metric'),
+                'type'        => $this->params->resourceType(),
+                'granularity' => $this->params->granularity(),
+            ],
         ];
     }
-}
+}

src/Metric/v1/Gnocchi/Models/Metric.php

@@ -6,7 +6,6 @@
 use OpenStack\Common\Resource\Retrievable;
 use OpenStack\Metric\v1\Gnocchi\Api;
 
-
 /**
  * @property Api $api
  */
@@ -47,4 +46,4 @@ public function retrieve()
         $response = $this->executeWithState($this->api->getMetric());
         $this->populateFromResponse($response);
     }
-}
+}

src/Metric/v1/Gnocchi/Models/Resource.php

@@ -94,19 +94,37 @@ public function retrieve()
      */
     public function getMetric(string $metric): Metric
     {
-        $response = $this->execute($this->api->getResourceMetric(), [
-            'resourceId' => $this->id,
-            'metric' => $metric,
-            'type'=> $this->type
-        ]);
+        $response = $this->execute(
+            $this->api->getResourceMetric(),
+            [
+                'resourceId' => $this->id,
+                'metric'     => $metric,
+                'type'       => $this->type,
+            ]
+        );
         $metric = $this->model(Metric::class)->populateFromResponse($response);
 
         return $metric;
     }
 
-    public function getMetricMeasures()
+    /**
+     * @param array $options {@see \OpenStack\Metric\v1\Gnocchi\Api::getResourceMetricMeasures}
+     *
+     * @return array
+     */
+    public function getMetricMeasures(array $options = []): array
     {
+        $options = array_merge(
+            $options,
+            [
+                'resourceId' => $this->id,
+                'type'       => $this->type,
+            ]
+        );
 
+        $response = $this->execute($this->api->getResourceMetricMeasures(), $options);
+
+        return \GuzzleHttp\json_decode($response->getBody());
     }
 
     /**
@@ -121,5 +139,3 @@ public function listResourceMetrics(array $options = []): \Generator
         return $this->model(Metric::class)->enumerate($this->api->getResourceMetrics(), $options);
     }
 }
-
-

src/Metric/v1/Gnocchi/Models/ResourceType.php

@@ -14,5 +14,4 @@ class ResourceType extends OperatorResource
 
     /** @var object */
     public $attributes;
-
-}
+}

src/Metric/v1/Gnocchi/Params.php

@@ -50,7 +50,16 @@ public function idUrl($type)
         return [
             'required'    => true,
             'location'    => self::URL,
-            'description' => sprintf('The unique ID, or identifier, for the %s', $type)
+            'description' => sprintf('The unique ID, or identifier, for the %s', $type),
+        ];
+    }
+
+    public function granularity()
+    {
+        return [
+            'location'    => self::QUERY,
+            'type'        => self::STRING,
+            'description' => 'Specify the granularity to retrieve, rather than all the granularities available',
         ];
     }
 }

src/Metric/v1/Gnocchi/Service.php

@@ -7,7 +7,6 @@
 use OpenStack\Metric\v1\Gnocchi\Models\Resource;
 use OpenStack\Metric\v1\Gnocchi\Models\ResourceType;
 
-
 /**
  * Gnocci Metric v1 Service class
  *
@@ -77,4 +76,4 @@ private function injectGenericType(array &$options)
             $options['type'] = Resource::RESOURCE_TYPE_GENERIC;
         }
     }
-}
+}