resource: moved mrp_zone_count to manager API.

Change-Id: I58ff12748231a824986a9ae0fd059a54d3f52c6d

diff --git a/src/resource/manager-api.h b/src/resource/manager-api.h
index de3a81f..545f500 100644 (file)
--- a/src/resource/manager-api.h
+++ b/src/resource/manager-api.h
@@ -40,6 +40,8 @@ mrp_attr_t *mrp_zone_read_attribute(mrp_zone_t *zone,
 mrp_attr_t *mrp_zone_read_all_attributes(mrp_zone_t *zone,
                                          uint32_t buflen,
                                          mrp_attr_t *buf);
+uint32_t mrp_zone_count(void);
+mrp_zone_t *mrp_zone_find_by_name(const char *name);
 
 
 const char *mrp_application_class_get_name(mrp_application_class_t *class);
@@ -58,7 +60,6 @@ const char *mrp_resource_get_application_class(mrp_resource_t *resource);
 
 void mrp_resource_owner_recalc(uint32_t zoneid);
 
-mrp_zone_t *mrp_zone_find_by_name(const char *name);
 
 #endif  /* __MURPHY_RESOURCE_MANAGER_API_H__ */
 

diff --git a/src/resource/resource-owner.c b/src/resource/resource-owner.c
index a6d0b69..647c04a 100644 (file)
--- a/src/resource/resource-owner.c
+++ b/src/resource/resource-owner.c
@@ -39,6 +39,7 @@
 
 #include <murphy-db/mqi.h>
 
+#include <murphy/resource/manager-api.h>
 #include <murphy/resource/client-api.h>
 #include <murphy/resource/config-api.h>
 

diff --git a/src/resource/zone.h b/src/resource/zone.h
index bde9cf5..3d0edb7 100644 (file)
--- a/src/resource/zone.h
+++ b/src/resource/zone.h
@@ -44,7 +44,6 @@ struct mrp_zone_s {
 };
 
 
-uint32_t mrp_zone_count(void);
 mrp_zone_t *mrp_zone_find_by_id(uint32_t);
 mrp_zone_t *mrp_zone_find_by_name(const char *);