From 04d77e1d9ea651b97c8154c8920dbb89442f4a5d Mon Sep 17 00:00:00 2001
From: Victoria Martinez de la Cruz <victoria@redhat.com>
Date: Fri, 21 Jul 2017 11:20:57 -0300
Subject: [PATCH] Fix share.size meter

Availability zone and name attributes were marked
as required while they are not, hence causing errors
when Gnocchi tried to create the resource.

This patch set removes the requirement over those attributes.
Availability zone has been removed, it will be shown only
when its present. Name has been replaced with share_id, which
is always present.

Other attributes has been added as well to keep track of other
relevant data.

Closes-Bug: #1706440

Change-Id: I191bcfae155278f7688c1148ad7e6994a0322fa6
---
 ceilometer/data/meters.d/meters.yaml              | 3 ++-
 ceilometer/dispatcher/data/gnocchi_resources.yaml | 3 ++-
 ceilometer/gnocchi_client.py                      | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ceilometer/data/meters.d/meters.yaml b/ceilometer/data/meters.d/meters.yaml
index a2b2dde8ca..70e3855d7e 100644
--- a/ceilometer/data/meters.d/meters.yaml
+++ b/ceilometer/data/meters.d/meters.yaml
@@ -355,5 +355,6 @@ metric:
     metadata:
       name: $.payload.name
       host: $.payload.host
-      availability_zone: $.payload.availability_zone
       status: $.payload.status
+      availability_zone: $.payload.availability_zone
+      protocol: $.payload.proto
diff --git a/ceilometer/dispatcher/data/gnocchi_resources.yaml b/ceilometer/dispatcher/data/gnocchi_resources.yaml
index 65e9e9580d..a92ce7d599 100644
--- a/ceilometer/dispatcher/data/gnocchi_resources.yaml
+++ b/ceilometer/dispatcher/data/gnocchi_resources.yaml
@@ -244,8 +244,9 @@ resources:
     attributes:
       name: resource_metadata.name
       host: resource_metadata.host
-      availability_zone: resource_metadata.availability_zone
       status: resource_metadata.status
+      availability_zone: resource_metadata.availability_zone
+      protocol: resource_metadata.protocol
 
   - resource_type: switch
     metrics:
diff --git a/ceilometer/gnocchi_client.py b/ceilometer/gnocchi_client.py
index a698aa159c..e35212f817 100644
--- a/ceilometer/gnocchi_client.py
+++ b/ceilometer/gnocchi_client.py
@@ -132,13 +132,15 @@ resources_update_operations = [
      "resource_type": "manila_share",
      "data": [{
          "attributes": {"name": {"type": "string", "min_length": 0,
-                                 "max_length": 255, "required": True},
+                                 "max_length": 255, "required": False},
                         "host": {"type": "string", "min_length": 0,
                                  "max_length": 255, "required": True},
+                        "protocol": {"type": "string", "min_length": 0,
+                                     "max_length": 255, "required": False},
                         "availability_zone": {"type": "string",
                                               "min_length": 0,
                                               "max_length": 255,
-                                              "required": True},
+                                              "required": False},
                         "status": {"type": "string", "min_length": 0,
                                    "max_length": 255,
                                    "required": True}}