From 503b2835b82df3239ad9cb96f3caf34113efff24 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sun, 7 May 2017 21:52:34 +0200 Subject: [PATCH] F #4809: Update API internal name to match public xml-rpc names. Do not log heartbeat/replicate log entries --- include/Request.h | 4 + include/RequestManagerAcl.h | 6 +- include/RequestManagerAllocate.h | 34 +++---- include/RequestManagerAllocateDB.h | 6 +- include/RequestManagerChmod.h | 22 ++--- include/RequestManagerChown.h | 24 ++--- include/RequestManagerClone.h | 8 +- include/RequestManagerCluster.h | 12 +-- include/RequestManagerDatastore.h | 5 +- include/RequestManagerDelete.h | 32 +++---- include/RequestManagerDropDB.h | 4 +- include/RequestManagerGroup.h | 6 +- include/RequestManagerHost.h | 4 +- include/RequestManagerImage.h | 14 +-- include/RequestManagerInfo.h | 34 +++---- include/RequestManagerLock.h | 4 +- include/RequestManagerMarketPlaceApp.h | 2 +- include/RequestManagerPoolInfoFilter.h | 42 ++++----- include/RequestManagerRename.h | 30 +++--- include/RequestManagerSecurityGroup.h | 2 +- include/RequestManagerSystem.h | 14 +-- include/RequestManagerUpdateDB.h | 6 +- include/RequestManagerUpdateTemplate.h | 34 +++---- include/RequestManagerUser.h | 13 +-- include/RequestManagerVMTemplate.h | 2 +- include/RequestManagerVdc.h | 121 ++++++++----------------- include/RequestManagerVirtualMachine.h | 40 ++++---- include/RequestManagerVirtualNetwork.h | 16 ++-- include/RequestManagerVirtualRouter.h | 20 ++-- include/RequestManagerZone.h | 18 ++-- src/rm/Request.cc | 12 ++- 31 files changed, 277 insertions(+), 314 deletions(-) diff --git a/include/Request.h b/include/Request.h index 1b4755e8b3..f11933eedd 100644 --- a/include/Request.h +++ b/include/Request.h @@ -175,6 +175,8 @@ protected: static string format_str; + bool log_method_call; //Write method call and result to the log + /* ---------------------------------------------------------------------- */ /* Class Constructors */ /* ---------------------------------------------------------------------- */ @@ -185,6 +187,8 @@ protected: _help = help; hidden_params.clear(); + + log_method_call = true; }; virtual ~Request(){}; diff --git a/include/RequestManagerAcl.h b/include/RequestManagerAcl.h index c21a80888b..661894a214 100644 --- a/include/RequestManagerAcl.h +++ b/include/RequestManagerAcl.h @@ -60,7 +60,7 @@ class AclAddRule : public RequestManagerAcl { public: AclAddRule(): - RequestManagerAcl("AclAddRule", + RequestManagerAcl("one.acl.addrule", "Adds a new ACL rule", "A:ssss") {}; @@ -78,7 +78,7 @@ class AclDelRule : public RequestManagerAcl { public: AclDelRule(): - RequestManagerAcl("AclDelRule", + RequestManagerAcl("one.acl.delrule", "Deletes an existing ACL rule", "A:si") {}; @@ -96,7 +96,7 @@ class AclInfo: public RequestManagerAcl { public: AclInfo(): - RequestManagerAcl("AclInfo", + RequestManagerAcl("one.acl.info", "Returns the ACL rule set", "A:s") {}; diff --git a/include/RequestManagerAllocate.h b/include/RequestManagerAllocate.h index 9f099eeac7..df4bd42615 100644 --- a/include/RequestManagerAllocate.h +++ b/include/RequestManagerAllocate.h @@ -126,7 +126,7 @@ class VirtualMachineAllocate: public RequestManagerAllocate { public: VirtualMachineAllocate(): - RequestManagerAllocate("VirtualMachineAllocate", + RequestManagerAllocate("one.vm.allocate", "Allocates a new virtual machine", "A:ssb", true) @@ -162,7 +162,7 @@ class VirtualNetworkAllocate: public RequestManagerAllocate { public: VirtualNetworkAllocate(): - RequestManagerAllocate("VirtualNetworkAllocate", + RequestManagerAllocate("one.vn.allocate", "Allocates a new virtual network", "A:ssi", true) @@ -209,7 +209,7 @@ class ImageAllocate: public RequestManagerAllocate { public: ImageAllocate(): - RequestManagerAllocate("ImageAllocate", + RequestManagerAllocate("one.image.allocate", "Allocates a new image", "A:ssi", true) @@ -234,7 +234,7 @@ class TemplateAllocate : public RequestManagerAllocate { public: TemplateAllocate(): - RequestManagerAllocate("TemplateAllocate", + RequestManagerAllocate("one.template.allocate", "Allocates a new virtual machine template", "A:ss", true) @@ -270,7 +270,7 @@ class HostAllocate : public RequestManagerAllocate { public: HostAllocate(): - RequestManagerAllocate("HostAllocate", + RequestManagerAllocate("one.host.allocate", "Allocates a new host", "A:ssssi", false) @@ -312,7 +312,7 @@ class UserAllocate: public RequestManagerAllocate { public: UserAllocate(): - RequestManagerAllocate("UserAllocate", + RequestManagerAllocate("one.user.allocate", "Returns user information", "A:ssssA", false) @@ -346,7 +346,7 @@ class GroupAllocate: public RequestManagerAllocate { public: GroupAllocate(): - RequestManagerAllocate("GroupAllocate", + RequestManagerAllocate("one.group.allocate", "Allocates a new group", "A:ss", false) @@ -376,7 +376,7 @@ class DatastoreAllocate: public RequestManagerAllocate { public: DatastoreAllocate(): - RequestManagerAllocate("DatastoreAllocate", + RequestManagerAllocate("one.datastore.allocate", "Allocates a new Datastore", "A:ssi", true) @@ -423,7 +423,7 @@ class ClusterAllocate: public RequestManagerAllocate { public: ClusterAllocate(): - RequestManagerAllocate("ClusterAllocate", + RequestManagerAllocate("one.cluster.allocate", "Allocates a new cluster", "A:ss", false) @@ -448,7 +448,7 @@ class DocumentAllocate : public RequestManagerAllocate { public: DocumentAllocate(): - RequestManagerAllocate("DocumentAllocate", + RequestManagerAllocate("one.document.allocate", "Allocates a new generic document", "A:ssi", true) @@ -480,7 +480,7 @@ class ZoneAllocate: public RequestManagerAllocate { public: ZoneAllocate(): - RequestManagerAllocate("ZoneAllocate", + RequestManagerAllocate("one.zone.allocate", "Allocates a new zone", "A:ss", true) @@ -515,7 +515,7 @@ class SecurityGroupAllocate : public RequestManagerAllocate { public: SecurityGroupAllocate(): - RequestManagerAllocate("SecurityGroupAllocate", + RequestManagerAllocate("one.secgroup.allocate", "Allocates a new security group", "A:ss", true) @@ -547,7 +547,7 @@ class VdcAllocate : public RequestManagerAllocate { public: VdcAllocate(): - RequestManagerAllocate("VdcAllocate", + RequestManagerAllocate("one.vdc.allocate", "Allocates a new VDC", "A:ss", true) @@ -580,7 +580,7 @@ class VirtualRouterAllocate : public RequestManagerAllocate { public: VirtualRouterAllocate(): - RequestManagerAllocate("VirtualRouterAllocate", + RequestManagerAllocate("one.vrouter.allocate", "Allocates a new virtual router", "A:ss", true) @@ -616,7 +616,7 @@ class MarketPlaceAllocate : public RequestManagerAllocate { public: MarketPlaceAllocate(): - RequestManagerAllocate("MarketPlaceAllocate", + RequestManagerAllocate("one.market.allocate", "Allocates a new marketplace", "A:ss", true) @@ -648,7 +648,7 @@ class MarketPlaceAppAllocate : public RequestManagerAllocate { public: MarketPlaceAppAllocate(): - RequestManagerAllocate("MarketPlaceAppAllocate", + RequestManagerAllocate("one.marketapp.allocate", "Allocates a new marketplace app", "A:ssi", true) @@ -683,7 +683,7 @@ class VMGroupAllocate : public RequestManagerAllocate { public: VMGroupAllocate(): - RequestManagerAllocate("VMGroupAllocate", + RequestManagerAllocate("one.vmgroup.allocate", "Allocates a new vm group", "A:ss", true) diff --git a/include/RequestManagerAllocateDB.h b/include/RequestManagerAllocateDB.h index 73cf4cd75c..1997a6fc69 100644 --- a/include/RequestManagerAllocateDB.h +++ b/include/RequestManagerAllocateDB.h @@ -25,7 +25,7 @@ class RequestManagerAllocateDB: public Request { protected: - RequestManagerAllocateDB(): Request("AllocateDB", "A:ss", + RequestManagerAllocateDB(const string& name): Request(name, "A:ss", "Allocates a new object from its template representation") { auth_op = AuthRequest::MANAGE; @@ -69,7 +69,7 @@ protected: class MarketPlaceAppAllocateDB: public RequestManagerAllocateDB { public: - MarketPlaceAppAllocateDB(): RequestManagerAllocateDB() + MarketPlaceAppAllocateDB():RequestManagerAllocateDB("one.marketapp.allocatedb") { auth_object = PoolObjectSQL::MARKETPLACEAPP; pool = Nebula::instance().get_apppool(); @@ -95,7 +95,7 @@ public: class MarketPlaceAllocateDB: public RequestManagerAllocateDB { public: - MarketPlaceAllocateDB(): RequestManagerAllocateDB() + MarketPlaceAllocateDB(): RequestManagerAllocateDB("one.market.allocatedb") { auth_object = PoolObjectSQL::MARKETPLACE; pool = Nebula::instance().get_marketpool(); diff --git a/include/RequestManagerChmod.h b/include/RequestManagerChmod.h index 4e83b39369..9d8f94b727 100644 --- a/include/RequestManagerChmod.h +++ b/include/RequestManagerChmod.h @@ -52,7 +52,7 @@ class VirtualMachineChmod : public RequestManagerChmod { public: VirtualMachineChmod(): - RequestManagerChmod("VirtualMachineChmod", + RequestManagerChmod("one.vm.chmod", "Changes permission bits of a virtual machine") { Nebula& nd = Nebula::instance(); @@ -70,7 +70,7 @@ class TemplateChmod : public RequestManagerChmod { public: TemplateChmod(): - RequestManagerChmod("TemplateChmod", "Changes permission bits of a " + RequestManagerChmod("one.template.chmod", "Changes permission bits of a " "virtual machine template", "A:siiiiiiiiiib") { Nebula& nd = Nebula::instance(); @@ -102,7 +102,7 @@ class VirtualNetworkChmod: public RequestManagerChmod { public: VirtualNetworkChmod(): - RequestManagerChmod("VirtualNetworkChmod", + RequestManagerChmod("one.vn.chmod", "Changes permission bits of a virtual network") { Nebula& nd = Nebula::instance(); @@ -120,7 +120,7 @@ class ImageChmod: public RequestManagerChmod { public: ImageChmod(): - RequestManagerChmod("ImageChmod", + RequestManagerChmod("one.image.chmod", "Changes permission bits of an image") { Nebula& nd = Nebula::instance(); @@ -146,7 +146,7 @@ class DatastoreChmod: public RequestManagerChmod { public: DatastoreChmod(): - RequestManagerChmod("DatastoreChmod", + RequestManagerChmod("one.datastore.chmod", "Changes permission bits of a datastore") { Nebula& nd = Nebula::instance(); @@ -164,7 +164,7 @@ class DocumentChmod : public RequestManagerChmod { public: DocumentChmod(): - RequestManagerChmod("DocumentChmod", + RequestManagerChmod("one.document.chmod", "Changes permission bits of a generic document") { Nebula& nd = Nebula::instance(); @@ -182,7 +182,7 @@ class SecurityGroupChmod: public RequestManagerChmod { public: SecurityGroupChmod(): - RequestManagerChmod("SecurityGroupChmod", + RequestManagerChmod("one.secgroup.chmod", "Changes permission bits of a security group") { Nebula& nd = Nebula::instance(); @@ -200,7 +200,7 @@ class VirtualRouterChmod: public RequestManagerChmod { public: VirtualRouterChmod(): - RequestManagerChmod("VirtualRouterChmod", + RequestManagerChmod("one.vrouter.chmod", "Changes permission bits of a virtual router") { Nebula& nd = Nebula::instance(); @@ -218,7 +218,7 @@ class MarketPlaceChmod: public RequestManagerChmod { public: MarketPlaceChmod(): - RequestManagerChmod("MarketPlaceChmod", + RequestManagerChmod("one.market.chmod", "Changes permission bits of a marketplace") { Nebula& nd = Nebula::instance(); @@ -236,7 +236,7 @@ class MarketPlaceAppChmod: public RequestManagerChmod { public: MarketPlaceAppChmod(): - RequestManagerChmod("MarketPlaceAppChmod", + RequestManagerChmod("one.marketapp.chmod", "Changes permission bits of a marketplace app") { Nebula& nd = Nebula::instance(); @@ -254,7 +254,7 @@ class VMGroupChmod: public RequestManagerChmod { public: VMGroupChmod(): - RequestManagerChmod("VMGroupChmod", + RequestManagerChmod("one.vmgroup.chmod", "Changes permission bits of a vm group") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerChown.h b/include/RequestManagerChown.h index 6656c27d02..640e714515 100644 --- a/include/RequestManagerChown.h +++ b/include/RequestManagerChown.h @@ -80,7 +80,7 @@ class VirtualMachineChown : public RequestManagerChown { public: VirtualMachineChown(): - RequestManagerChown("VirtualMachineChown", + RequestManagerChown("one.vm.chown", "Changes ownership of a virtual machine") { Nebula& nd = Nebula::instance(); @@ -108,7 +108,7 @@ class TemplateChown : public RequestManagerChown { public: TemplateChown(): - RequestManagerChown("TemplateChown", + RequestManagerChown("one.template.chown", "Changes ownership of a virtual machine template") { Nebula& nd = Nebula::instance(); @@ -132,7 +132,7 @@ class VirtualNetworkChown: public RequestManagerChown { public: VirtualNetworkChown(): - RequestManagerChown("VirtualNetworkChown", + RequestManagerChown("one.vn.chown", "Changes ownership of a virtual network") { Nebula& nd = Nebula::instance(); @@ -155,7 +155,7 @@ class ImageChown: public RequestManagerChown { public: ImageChown(): - RequestManagerChown("ImageChown", + RequestManagerChown("one.image.chown", "Changes ownership of an image") { Nebula& nd = Nebula::instance(); @@ -178,7 +178,7 @@ class UserChown : public RequestManagerChown { public: UserChown(): - RequestManagerChown("UserChown", + RequestManagerChown("one.user.chgrp", "Changes ownership of a user", "A:sii") { @@ -207,7 +207,7 @@ class DatastoreChown: public RequestManagerChown { public: DatastoreChown(): - RequestManagerChown("Datastore", + RequestManagerChown("one.datastore.chown", "Changes ownership of a datastore") { Nebula& nd = Nebula::instance(); @@ -230,7 +230,7 @@ class DocumentChown : public RequestManagerChown { public: DocumentChown(): - RequestManagerChown("DocumentChown", + RequestManagerChown("one.document.chown", "Changes ownership of a generic document") { Nebula& nd = Nebula::instance(); @@ -253,7 +253,7 @@ class SecurityGroupChown: public RequestManagerChown { public: SecurityGroupChown(): - RequestManagerChown("SecurityGroupChown", + RequestManagerChown("one.secgroup.chown", "Changes ownership of a security group") { Nebula& nd = Nebula::instance(); @@ -276,7 +276,7 @@ class VirtualRouterChown: public RequestManagerChown { public: VirtualRouterChown(): - RequestManagerChown("VirtualRouterChown", + RequestManagerChown("one.vrouter.chown", "Changes ownership of a virtual router") { Nebula& nd = Nebula::instance(); @@ -299,7 +299,7 @@ class MarketPlaceChown: public RequestManagerChown { public: MarketPlaceChown(): - RequestManagerChown("MarketPlaceChown", + RequestManagerChown("one.market.chown", "Changes ownership of a marketplace") { Nebula& nd = Nebula::instance(); @@ -322,7 +322,7 @@ class MarketPlaceAppChown: public RequestManagerChown { public: MarketPlaceAppChown(): - RequestManagerChown("MarketPlaceAppChown", + RequestManagerChown("one.marketapp.chown", "Changes ownership of a marketplace app") { Nebula& nd = Nebula::instance(); @@ -345,7 +345,7 @@ class VMGroupChown: public RequestManagerChown { public: VMGroupChown(): - RequestManagerChown("VMGroupChown", + RequestManagerChown("one.vmgroup.chown", "Changes ownership of a vm group") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerClone.h b/include/RequestManagerClone.h index 82a8d78f56..d6cb1f8c5d 100644 --- a/include/RequestManagerClone.h +++ b/include/RequestManagerClone.h @@ -79,8 +79,8 @@ class VMTemplateClone : public RequestManagerClone { public: VMTemplateClone(): - RequestManagerClone("VMTemplateClone","Clone a virtual machine template", - "A:sisb") + RequestManagerClone("one.template.clone", + "Clone a virtual machine template", "A:sisb") { Nebula& nd = Nebula::instance(); pool = nd.get_tpool(); @@ -132,7 +132,7 @@ class DocumentClone : public RequestManagerClone { public: DocumentClone(): - RequestManagerClone("DocumentClone", "Clone existing document") + RequestManagerClone("one.document.clone", "Clone existing document") { Nebula& nd = Nebula::instance(); pool = nd.get_docpool(); @@ -176,7 +176,7 @@ class SecurityGroupClone : public RequestManagerClone { public: SecurityGroupClone(): - RequestManagerClone("SecurityGroupClone", "Clone a security group") + RequestManagerClone("one.secgroup.clone", "Clone a security group") { Nebula& nd = Nebula::instance(); pool = nd.get_secgrouppool(); diff --git a/include/RequestManagerCluster.h b/include/RequestManagerCluster.h index b9f3e8d18c..6fbe30acaa 100644 --- a/include/RequestManagerCluster.h +++ b/include/RequestManagerCluster.h @@ -144,7 +144,7 @@ class ClusterAddHost : public RequestManagerClusterHost { public: ClusterAddHost(): - RequestManagerClusterHost("ClusterAddHost", + RequestManagerClusterHost("one.cluster.addhost", "Adds a host to the cluster", "A:sii"){}; @@ -167,7 +167,7 @@ class ClusterDelHost : public RequestManagerClusterHost { public: ClusterDelHost(): - RequestManagerClusterHost("ClusterDelHost", + RequestManagerClusterHost("one.cluster.delhost", "Deletes a host from its cluster", "A:sii"){}; @@ -228,7 +228,7 @@ class ClusterAddDatastore : public RequestManagerClusterDatastore { public: ClusterAddDatastore(): - RequestManagerClusterDatastore("ClusterAddDatastore", + RequestManagerClusterDatastore("one.cluster.adddatastore", "Adds a datastore to the cluster", "A:sii"){}; @@ -252,7 +252,7 @@ class ClusterDelDatastore : public RequestManagerClusterDatastore { public: ClusterDelDatastore(): - RequestManagerClusterDatastore("ClusterDelDatastore", + RequestManagerClusterDatastore("one.cluster.deldatastore", "Deletes a datastore from its cluster", "A:sii"){}; @@ -313,7 +313,7 @@ class ClusterAddVNet : public RequestManagerClusterVNet { public: ClusterAddVNet(): - RequestManagerClusterVNet("ClusterAddVNet", + RequestManagerClusterVNet("one.cluster.addvnet", "Adds a virtual network to the cluster", "A:sii"){}; @@ -337,7 +337,7 @@ class ClusterDelVNet : public RequestManagerClusterVNet { public: ClusterDelVNet(): - RequestManagerClusterVNet("ClusterDelVNet", + RequestManagerClusterVNet("one.cluster.delvnet", "Deletes a virtual network from its cluster", "A:sii"){}; diff --git a/include/RequestManagerDatastore.h b/include/RequestManagerDatastore.h index 5d173d921a..b6a6c08e57 100644 --- a/include/RequestManagerDatastore.h +++ b/include/RequestManagerDatastore.h @@ -55,9 +55,8 @@ protected: class DatastoreEnable : public RequestManagerDatastore { public: - DatastoreEnable(): - RequestManagerDatastore("DatastoreEnable", "Enables or disables an datastore", - "A:sib"){}; + DatastoreEnable(): RequestManagerDatastore("one.datastore.enable", + "Enables or disables an datastore", "A:sib"){}; ~DatastoreEnable(){}; diff --git a/include/RequestManagerDelete.h b/include/RequestManagerDelete.h index b1bd5b587f..8d973104a1 100644 --- a/include/RequestManagerDelete.h +++ b/include/RequestManagerDelete.h @@ -92,7 +92,7 @@ class TemplateDelete : public RequestManagerDelete { public: TemplateDelete(): - RequestManagerDelete("TemplateDelete", + RequestManagerDelete("one.template.delete", "A:sib" "Deletes a virtual machine template") { @@ -120,7 +120,7 @@ class VirtualNetworkDelete: public RequestManagerDelete { public: VirtualNetworkDelete(): - RequestManagerDelete("VirtualNetworkDelete", + RequestManagerDelete("one.vn.delete", "Deletes a virtual network") { Nebula& nd = Nebula::instance(); @@ -152,7 +152,7 @@ class ImageDelete: public RequestManagerDelete { public: ImageDelete(): - RequestManagerDelete("ImageDelete", "Deletes an image") + RequestManagerDelete("one.image.delete", "Deletes an image") { Nebula& nd = Nebula::instance(); pool = nd.get_ipool(); @@ -178,7 +178,7 @@ class HostDelete : public RequestManagerDelete { public: HostDelete(): - RequestManagerDelete("HostDelete", "Deletes a host") + RequestManagerDelete("one.host.delete", "Deletes a host") { Nebula& nd = Nebula::instance(); pool = nd.get_hpool(); @@ -214,7 +214,7 @@ class GroupDelete: public RequestManagerDelete { public: GroupDelete(): - RequestManagerDelete("GroupDelete", "Deletes a group") + RequestManagerDelete("one.group.delete", "Deletes a group") { Nebula& nd = Nebula::instance(); pool = nd.get_gpool(); @@ -237,7 +237,7 @@ class UserDelete: public RequestManagerDelete { public: UserDelete(): - RequestManagerDelete("UserDelete", "Deletes a user") + RequestManagerDelete("one.user.delete", "Deletes a user") { Nebula& nd = Nebula::instance(); pool = nd.get_upool(); @@ -263,7 +263,7 @@ class DatastoreDelete: public RequestManagerDelete { public: DatastoreDelete(): - RequestManagerDelete("DatastoreDelete", "Deletes a datastore") + RequestManagerDelete("one.datastore.delete", "Deletes a datastore") { Nebula& nd = Nebula::instance(); pool = nd.get_dspool(); @@ -293,7 +293,7 @@ class ClusterDelete: public RequestManagerDelete { public: ClusterDelete(): - RequestManagerDelete("ClusterDelete", "Deletes a cluster") + RequestManagerDelete("one.cluster.delete", "Deletes a cluster") { Nebula& nd = Nebula::instance(); pool = nd.get_clpool(); @@ -315,7 +315,7 @@ class DocumentDelete : public RequestManagerDelete { public: DocumentDelete(): - RequestManagerDelete("DocumentDelete", + RequestManagerDelete("one.document.delete", "Deletes a generic document") { Nebula& nd = Nebula::instance(); @@ -333,7 +333,7 @@ class ZoneDelete: public RequestManagerDelete { public: ZoneDelete(): - RequestManagerDelete("ZoneDelete", "Deletes a zone") + RequestManagerDelete("one.zone.delete", "Deletes a zone") { Nebula& nd = Nebula::instance(); pool = nd.get_zonepool(); @@ -355,7 +355,7 @@ class SecurityGroupDelete : public RequestManagerDelete { public: SecurityGroupDelete(): - RequestManagerDelete("SecurityGroupDelete", + RequestManagerDelete("one.secgroup.delete", "Deletes a security group") { Nebula& nd = Nebula::instance(); @@ -377,7 +377,7 @@ class VdcDelete: public RequestManagerDelete { public: VdcDelete(): - RequestManagerDelete("VdcDelete", "Deletes a VDC") + RequestManagerDelete("one.vdc.delete", "Deletes a VDC") { Nebula& nd = Nebula::instance(); pool = nd.get_vdcpool(); @@ -395,7 +395,7 @@ class VirtualRouterDelete : public RequestManagerDelete { public: VirtualRouterDelete(): - RequestManagerDelete("VirtualRouterDelete", + RequestManagerDelete("one.vrouter.delete", "Deletes a virtual router") { Nebula& nd = Nebula::instance(); @@ -416,7 +416,7 @@ class MarketPlaceDelete : public RequestManagerDelete { public: MarketPlaceDelete(): - RequestManagerDelete("MarketPlaceDelete", + RequestManagerDelete("one.market.delete", "Deletes a marketplace") { Nebula& nd = Nebula::instance(); @@ -438,7 +438,7 @@ class MarketPlaceAppDelete : public RequestManagerDelete { public: MarketPlaceAppDelete(): - RequestManagerDelete("MarketPlaceAppDelete", + RequestManagerDelete("one.marketapp.delete", "Deletes a marketplace app") { Nebula& nd = Nebula::instance(); @@ -460,7 +460,7 @@ class VMGroupDelete : public RequestManagerDelete { public: VMGroupDelete(): - RequestManagerDelete("VMGroupDelete", + RequestManagerDelete("one.vmgroup.delete", "Deletes a vm group") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerDropDB.h b/include/RequestManagerDropDB.h index a63549aa0d..5d76ed7b4d 100644 --- a/include/RequestManagerDropDB.h +++ b/include/RequestManagerDropDB.h @@ -25,7 +25,7 @@ class RequestManagerDropDB: public Request { protected: - RequestManagerDropDB(): Request("DropDB", "A:si", + RequestManagerDropDB(const string& name): Request(name, "A:si", "Drops an object from DB") { auth_op = AuthRequest::MANAGE; @@ -75,7 +75,7 @@ protected: class MarketPlaceAppDropDB : public RequestManagerDropDB { public: - MarketPlaceAppDropDB():RequestManagerDropDB() + MarketPlaceAppDropDB():RequestManagerDropDB("one.marketapp.dropdb") { auth_object = PoolObjectSQL::MARKETPLACEAPP; pool = Nebula::instance().get_apppool(); diff --git a/include/RequestManagerGroup.h b/include/RequestManagerGroup.h index 75ef5e6316..e12fc57729 100644 --- a/include/RequestManagerGroup.h +++ b/include/RequestManagerGroup.h @@ -53,7 +53,7 @@ class GroupSetQuota : public RequestManagerGroup { public: GroupSetQuota(): - RequestManagerGroup("GroupSetQuota", + RequestManagerGroup("one.group.quota", "Sets group quota limits", "A:sis") { @@ -101,7 +101,7 @@ class GroupAddAdmin : public GroupEditAdmin { public: GroupAddAdmin(): - GroupEditAdmin( "GroupAddAdmin", + GroupEditAdmin( "one.group.addadmin", "Adds a user to the group admin set", "A:sii"){}; @@ -117,7 +117,7 @@ class GroupDelAdmin : public GroupEditAdmin { public: GroupDelAdmin(): - GroupEditAdmin( "GroupDelAdmin", + GroupEditAdmin( "one.group.deladmin", "Removes a user from the group admin set", "A:sii"){}; diff --git a/include/RequestManagerHost.h b/include/RequestManagerHost.h index 60d5ea94b4..a89e95c9fe 100644 --- a/include/RequestManagerHost.h +++ b/include/RequestManagerHost.h @@ -62,7 +62,7 @@ public: }; HostStatus(): - RequestManagerHost("HostStatus", "Sets the status of the host", "A:sii") + RequestManagerHost("one.host.status", "Sets the status of the host", "A:sii") { auth_op = AuthRequest::ADMIN; }; @@ -80,7 +80,7 @@ class HostMonitoring : public RequestManagerHost { public: HostMonitoring(): - RequestManagerHost("HostMonitoring", + RequestManagerHost("one.host.monitoring", "Returns the host monitoring records", "A:si") { diff --git a/include/RequestManagerImage.h b/include/RequestManagerImage.h index 6adb687a6c..2a76d9fdd8 100644 --- a/include/RequestManagerImage.h +++ b/include/RequestManagerImage.h @@ -56,7 +56,7 @@ class ImageEnable : public RequestManagerImage { public: ImageEnable(): - RequestManagerImage("ImageEnable", "Enables or disables an image", + RequestManagerImage("one.image.enable", "Enables or disables an image", "A:sib"){}; ~ImageEnable(){}; @@ -74,7 +74,7 @@ class ImagePersistent : public RequestManagerImage { public: ImagePersistent(): - RequestManagerImage("ImagePersistent", + RequestManagerImage("one.image.persistent", "Makes an image persistent or non-persistent", "A:sib"){}; @@ -95,7 +95,7 @@ class ImageChangeType : public RequestManagerImage { public: ImageChangeType(): - RequestManagerImage("ImageChangeType", "Changes the type of an image", + RequestManagerImage("one.image.chtype", "Changes the type of an image", "A:sis"){}; ~ImageChangeType(){}; @@ -113,7 +113,7 @@ class ImageClone : public RequestManagerImage { public: ImageClone(): - RequestManagerImage("ImageClone", "Clones an existing image", "A:sis") + RequestManagerImage("one.image.clone", "Clones an existing image", "A:sis") { auth_op = AuthRequest::USE; }; @@ -136,7 +136,7 @@ class ImageSnapshotRevert : public RequestManagerImage { public: ImageSnapshotRevert(): - RequestManagerImage("ImageSnapshotRevert", + RequestManagerImage("one.image.snapshotrevert", "Reverts image state to a previous snapshot", "A:sii"){}; ~ImageSnapshotRevert(){}; @@ -154,7 +154,7 @@ class ImageSnapshotFlatten : public RequestManagerImage { public: ImageSnapshotFlatten(): - RequestManagerImage("ImageSnapshotFlatten", + RequestManagerImage("one.image.snapshotflatten", "Flattens the selected image snapshot", "A:sii"){}; ~ImageSnapshotFlatten(){}; @@ -172,7 +172,7 @@ class ImageSnapshotDelete : public RequestManagerImage { public: ImageSnapshotDelete(): - RequestManagerImage("ImageSnapshotDelete", + RequestManagerImage("one.image.snapshotdelete", "Deletes a snapshot from image", "A:sii"){}; ~ImageSnapshotDelete(){}; diff --git a/include/RequestManagerInfo.h b/include/RequestManagerInfo.h index 4e2a96e17f..b2c91a8ade 100644 --- a/include/RequestManagerInfo.h +++ b/include/RequestManagerInfo.h @@ -59,7 +59,7 @@ class VirtualMachineInfo : public RequestManagerInfo { public: VirtualMachineInfo(): - RequestManagerInfo("VirtualMachineInfo", + RequestManagerInfo("one.vm.info", "Returns virtual machine instance information") { Nebula& nd = Nebula::instance(); @@ -84,7 +84,7 @@ class TemplateInfo : public RequestManagerInfo { public: TemplateInfo(): - RequestManagerInfo("TemplateInfo", + RequestManagerInfo("one.template.info", "Returns virtual machine template information") { Nebula& nd = Nebula::instance(); @@ -108,7 +108,7 @@ class VirtualNetworkInfo: public RequestManagerInfo { public: VirtualNetworkInfo(): - RequestManagerInfo("VirtualNetworkInfo", + RequestManagerInfo("one.vn.info", "Returns virtual network information") { Nebula& nd = Nebula::instance(); @@ -130,7 +130,7 @@ class ImageInfo: public RequestManagerInfo { public: ImageInfo(): - RequestManagerInfo("ImageInfo", + RequestManagerInfo("one.image.info", "Returns image information") { Nebula& nd = Nebula::instance(); @@ -149,7 +149,7 @@ class HostInfo : public RequestManagerInfo { public: HostInfo(): - RequestManagerInfo("HostInfo", + RequestManagerInfo("one.host.info", "Returns host information") { Nebula& nd = Nebula::instance(); @@ -167,7 +167,7 @@ class GroupInfo: public RequestManagerInfo { public: GroupInfo(): - RequestManagerInfo("GroupInfo", + RequestManagerInfo("one.group.info", "Returns group information") { Nebula& nd = Nebula::instance(); @@ -192,7 +192,7 @@ class UserInfo: public RequestManagerInfo { public: UserInfo(): - RequestManagerInfo("UserInfo", + RequestManagerInfo("one.user.info", "Returns user information") { Nebula& nd = Nebula::instance(); @@ -217,7 +217,7 @@ class DatastoreInfo: public RequestManagerInfo { public: DatastoreInfo(): - RequestManagerInfo("DatastoreInfo", + RequestManagerInfo("one.datastore.info", "Returns datastore information") { Nebula& nd = Nebula::instance(); @@ -235,7 +235,7 @@ class ClusterInfo: public RequestManagerInfo { public: ClusterInfo(): - RequestManagerInfo("ClusterInfo", + RequestManagerInfo("one.cluster.info", "Returns cluster information") { Nebula& nd = Nebula::instance(); @@ -253,7 +253,7 @@ class DocumentInfo : public RequestManagerInfo { public: DocumentInfo(): - RequestManagerInfo("DocumentInfo", + RequestManagerInfo("one.document.info", "Returns generic document information") { Nebula& nd = Nebula::instance(); @@ -271,7 +271,7 @@ class ZoneInfo: public RequestManagerInfo { public: ZoneInfo(): - RequestManagerInfo("ZoneInfo", + RequestManagerInfo("one.zone.info", "Returns zone information") { Nebula& nd = Nebula::instance(); @@ -289,7 +289,7 @@ class SecurityGroupInfo : public RequestManagerInfo { public: SecurityGroupInfo(): - RequestManagerInfo("SecurityGroupInfo", + RequestManagerInfo("one.secgroup.info", "Returns security group information") { Nebula& nd = Nebula::instance(); @@ -307,7 +307,7 @@ class VdcInfo: public RequestManagerInfo { public: VdcInfo(): - RequestManagerInfo("VdcInfo", + RequestManagerInfo("one.vdc.info", "Returns VDC information") { Nebula& nd = Nebula::instance(); @@ -325,7 +325,7 @@ class VirtualRouterInfo : public RequestManagerInfo { public: VirtualRouterInfo(): - RequestManagerInfo("VirtualRouterInfo", + RequestManagerInfo("one.vrouter.info", "Returns virtual router information") { Nebula& nd = Nebula::instance(); @@ -343,7 +343,7 @@ class MarketPlaceInfo : public RequestManagerInfo { public: MarketPlaceInfo(): - RequestManagerInfo("MarketPlaceInfo", + RequestManagerInfo("one.market.info", "Returns marketplace information") { Nebula& nd = Nebula::instance(); @@ -361,7 +361,7 @@ class MarketPlaceAppInfo : public RequestManagerInfo { public: MarketPlaceAppInfo(): - RequestManagerInfo("MarketPlaceAppInfo", + RequestManagerInfo("one.marketapp.info", "Returns marketplace app information") { Nebula& nd = Nebula::instance(); @@ -379,7 +379,7 @@ class VMGroupInfo : public RequestManagerInfo { public: VMGroupInfo(): - RequestManagerInfo("VMGroupInfo", + RequestManagerInfo("one.vmgroup.info", "Returns vm group information") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerLock.h b/include/RequestManagerLock.h index 83fc52bed8..24104e4d3a 100644 --- a/include/RequestManagerLock.h +++ b/include/RequestManagerLock.h @@ -76,7 +76,7 @@ class DocumentLock : public RequestManagerLock { public: DocumentLock(): - RequestManagerLock("DocumentLock", + RequestManagerLock("one.document.lock", "Tries to acquire the object's lock") { Nebula& nd = Nebula::instance(); @@ -99,7 +99,7 @@ class DocumentUnlock : public RequestManagerUnlock { public: DocumentUnlock(): - RequestManagerUnlock("DocumentUnlock", + RequestManagerUnlock("one.document.unlock", "Unlocks the object") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerMarketPlaceApp.h b/include/RequestManagerMarketPlaceApp.h index 8505aacce1..885e46ea76 100644 --- a/include/RequestManagerMarketPlaceApp.h +++ b/include/RequestManagerMarketPlaceApp.h @@ -51,7 +51,7 @@ protected: class MarketPlaceAppEnable : public RequestManagerMarketPlaceApp { public: - MarketPlaceAppEnable(): RequestManagerMarketPlaceApp("MarketPlaceAppEnable", + MarketPlaceAppEnable(): RequestManagerMarketPlaceApp("one.marketapp.enable", "Enables or disables a marketplace app", "A:sib"){}; ~MarketPlaceAppEnable(){}; diff --git a/include/RequestManagerPoolInfoFilter.h b/include/RequestManagerPoolInfoFilter.h index 6f83e52389..19ee399967 100644 --- a/include/RequestManagerPoolInfoFilter.h +++ b/include/RequestManagerPoolInfoFilter.h @@ -109,7 +109,7 @@ public: /* -------------------------------------------------------------------- */ VirtualMachinePoolInfo(): - RequestManagerPoolInfoFilter("VirtualMachinePoolInfo", + RequestManagerPoolInfoFilter("one.vmpool.info", "Returns the virtual machine instances pool", "A:siiii") { @@ -134,7 +134,7 @@ class VirtualMachinePoolAccounting : public RequestManagerPoolInfoFilter public: VirtualMachinePoolAccounting(): - RequestManagerPoolInfoFilter("VirtualMachinePoolAccounting", + RequestManagerPoolInfoFilter("one.vmpool.accounting", "Returns the virtual machine history records", "A:siii") { @@ -159,7 +159,7 @@ class VirtualMachinePoolShowback : public RequestManagerPoolInfoFilter public: VirtualMachinePoolShowback(): - RequestManagerPoolInfoFilter("VirtualMachinePoolShowback", + RequestManagerPoolInfoFilter("one.vmpool.showback", "Returns the virtual machine showback records", "A:siiiii") { @@ -184,7 +184,7 @@ class VirtualMachinePoolMonitoring : public RequestManagerPoolInfoFilter public: VirtualMachinePoolMonitoring(): - RequestManagerPoolInfoFilter("VirtualMachinePoolMonitoring", + RequestManagerPoolInfoFilter("one.vmpool.monitoring", "Returns the virtual machine monitoring records", "A:si") { @@ -208,7 +208,7 @@ class TemplatePoolInfo : public RequestManagerPoolInfoFilter { public: TemplatePoolInfo(): - RequestManagerPoolInfoFilter("TemplatePoolInfo", + RequestManagerPoolInfoFilter("one.templatepool.info", "Returns the virtual machine template pool", "A:siii") { @@ -227,7 +227,7 @@ class VirtualNetworkPoolInfo: public RequestManagerPoolInfoFilter { public: VirtualNetworkPoolInfo(): - RequestManagerPoolInfoFilter("VirtualNetworkPoolInfo", + RequestManagerPoolInfoFilter("one.vnpool.info", "Returns the virtual network pool", "A:siii") { @@ -249,7 +249,7 @@ class ImagePoolInfo: public RequestManagerPoolInfoFilter { public: ImagePoolInfo(): - RequestManagerPoolInfoFilter("ImagePoolInfo", + RequestManagerPoolInfoFilter("one.imagepool.info", "Returns the image pool", "A:siii") { @@ -268,7 +268,7 @@ class HostPoolInfo : public RequestManagerPoolInfoFilter { public: HostPoolInfo(): - RequestManagerPoolInfoFilter("HostPoolInfo", + RequestManagerPoolInfoFilter("one.hostpool.info", "Returns the host pool", "A:s") { @@ -293,7 +293,7 @@ class HostPoolMonitoring : public RequestManagerPoolInfoFilter public: HostPoolMonitoring(): - RequestManagerPoolInfoFilter("HostPoolMonitoring", + RequestManagerPoolInfoFilter("one.hostpool.monitoring", "Returns the host monitoring records", "A:s") { @@ -317,7 +317,7 @@ class GroupPoolInfo: public RequestManagerPoolInfoFilter { public: GroupPoolInfo(): - RequestManagerPoolInfoFilter("GroupPoolInfo", + RequestManagerPoolInfoFilter("one.grouppool.info", "Returns the group pool", "A:s") { @@ -341,7 +341,7 @@ class UserPoolInfo: public RequestManagerPoolInfoFilter { public: UserPoolInfo(): - RequestManagerPoolInfoFilter("UserPoolInfo", + RequestManagerPoolInfoFilter("one.userpool.info", "Returns the user pool", "A:s") { @@ -365,7 +365,7 @@ class DatastorePoolInfo: public RequestManagerPoolInfoFilter { public: DatastorePoolInfo(): - RequestManagerPoolInfoFilter("DatastorePoolInfo", + RequestManagerPoolInfoFilter("one.datastorepool.info", "Returns the datastore pool", "A:s") { @@ -389,7 +389,7 @@ class ClusterPoolInfo: public RequestManagerPoolInfoFilter { public: ClusterPoolInfo(): - RequestManagerPoolInfoFilter("ClusterPoolInfo", + RequestManagerPoolInfoFilter("one.clusterpool.info", "Returns the cluster pool", "A:s") { @@ -413,7 +413,7 @@ class DocumentPoolInfo : public RequestManagerPoolInfoFilter { public: DocumentPoolInfo(): - RequestManagerPoolInfoFilter("DocumentPoolInfo", + RequestManagerPoolInfoFilter("one.documentpool.info", "Returns the generic document pool", "A:siiii") { @@ -437,7 +437,7 @@ class ZonePoolInfo : public RequestManagerPoolInfoFilter { public: ZonePoolInfo(): - RequestManagerPoolInfoFilter("ZonePoolInfo", + RequestManagerPoolInfoFilter("one.zonepool.info", "Returns the zone pool", "A:s") { @@ -461,7 +461,7 @@ class SecurityGroupPoolInfo : public RequestManagerPoolInfoFilter { public: SecurityGroupPoolInfo(): - RequestManagerPoolInfoFilter("SecurityGroupPoolInfo", + RequestManagerPoolInfoFilter("one.secgrouppool.info", "Returns the security group pool", "A:siii") { @@ -480,7 +480,7 @@ class VdcPoolInfo : public RequestManagerPoolInfoFilter { public: VdcPoolInfo(): - RequestManagerPoolInfoFilter("VdcPoolInfo", + RequestManagerPoolInfoFilter("one.vdcpool.info", "Returns the VDC pool", "A:s") { @@ -501,7 +501,7 @@ class VirtualRouterPoolInfo : public RequestManagerPoolInfoFilter { public: VirtualRouterPoolInfo(): - RequestManagerPoolInfoFilter("VirtualRouterPoolInfo", + RequestManagerPoolInfoFilter("one.vrouterpool.info", "Returns the virtual router pool", "A:siii") { @@ -520,7 +520,7 @@ class MarketPlacePoolInfo : public RequestManagerPoolInfoFilter { public: MarketPlacePoolInfo(): - RequestManagerPoolInfoFilter("MarketPlacePoolInfo", + RequestManagerPoolInfoFilter("one.marketpool.info", "Returns the marketplace pool", "A:s") { @@ -541,7 +541,7 @@ class MarketPlaceAppPoolInfo : public RequestManagerPoolInfoFilter { public: MarketPlaceAppPoolInfo(): - RequestManagerPoolInfoFilter("MarketPlacePoolInfo", + RequestManagerPoolInfoFilter("one.marketapppool.info", "Returns the market place pool", "A:siii") { @@ -560,7 +560,7 @@ class VMGroupPoolInfo : public RequestManagerPoolInfoFilter { public: VMGroupPoolInfo(): - RequestManagerPoolInfoFilter("VMGroupPoolInfo", + RequestManagerPoolInfoFilter("one.vmgrouppool.info", "Returns the vm group pool", "A:siii") { diff --git a/include/RequestManagerRename.h b/include/RequestManagerRename.h index bfea3e38f8..6090c59d24 100644 --- a/include/RequestManagerRename.h +++ b/include/RequestManagerRename.h @@ -109,7 +109,7 @@ class VirtualMachineRename : public RequestManagerRename { public: VirtualMachineRename(): - RequestManagerRename("VirtualMachineRename","Renames a virtual machine") + RequestManagerRename("one.vm.rename","Renames a virtual machine") { Nebula& nd = Nebula::instance(); pool = nd.get_vmpool(); @@ -128,7 +128,7 @@ class TemplateRename : public RequestManagerRename { public: TemplateRename(): - RequestManagerRename("TemplateRename", + RequestManagerRename("one.template.rename", "Renames a virtual machine template") { Nebula& nd = Nebula::instance(); @@ -152,7 +152,7 @@ class VirtualNetworkRename: public RequestManagerRename { public: VirtualNetworkRename(): - RequestManagerRename("VirtualNetworkRename","Renames a virtual network") + RequestManagerRename("one.vn.rename","Renames a virtual network") { Nebula& nd = Nebula::instance(); pool = nd.get_vnpool(); @@ -174,7 +174,7 @@ class ImageRename: public RequestManagerRename { public: ImageRename(): - RequestManagerRename("ImageRename", "Renames an image") + RequestManagerRename("one.image.rename", "Renames an image") { Nebula& nd = Nebula::instance(); pool = nd.get_ipool(); @@ -196,7 +196,7 @@ class DocumentRename : public RequestManagerRename { public: DocumentRename(): - RequestManagerRename("DocumentRename", "Renames a generic document") + RequestManagerRename("one.document.rename", "Renames a generic document") { Nebula& nd = Nebula::instance(); pool = nd.get_docpool(); @@ -213,7 +213,7 @@ class ClusterRename: public RequestManagerRename { public: ClusterRename(): - RequestManagerRename("ClusterRename", "Renames a cluster") + RequestManagerRename("one.cluster.rename", "Renames a cluster") { Nebula& nd = Nebula::instance(); pool = nd.get_clpool(); @@ -237,7 +237,7 @@ class DatastoreRename: public RequestManagerRename { public: DatastoreRename(): - RequestManagerRename("DatastoreRename", "Renames a datastore") + RequestManagerRename("one.datastore.rename", "Renames a datastore") { Nebula& nd = Nebula::instance(); pool = nd.get_dspool(); @@ -261,7 +261,7 @@ class HostRename: public RequestManagerRename { public: HostRename(): - RequestManagerRename("HostRename", "Renames a host") + RequestManagerRename("one.host.rename", "Renames a host") { Nebula& nd = Nebula::instance(); pool = nd.get_hpool(); @@ -287,7 +287,7 @@ class ZoneRename : public RequestManagerRename { public: ZoneRename(): - RequestManagerRename("ZoneRename", "Renames a zone") + RequestManagerRename("one.zone.rename", "Renames a zone") { Nebula& nd = Nebula::instance(); pool = nd.get_zonepool(); @@ -304,7 +304,7 @@ class SecurityGroupRename: public RequestManagerRename { public: SecurityGroupRename(): - RequestManagerRename("SecurityGroupRename", "Renames a security group") + RequestManagerRename("one.secgroup.rename", "Renames a security group") { Nebula& nd = Nebula::instance(); pool = nd.get_secgrouppool(); @@ -326,7 +326,7 @@ class VdcRename : public RequestManagerRename { public: VdcRename(): - RequestManagerRename("VdcRename", "Renames a VDC") + RequestManagerRename("one.vdc.rename", "Renames a VDC") { Nebula& nd = Nebula::instance(); pool = nd.get_vdcpool(); @@ -343,7 +343,7 @@ class VirtualRouterRename: public RequestManagerRename { public: VirtualRouterRename(): - RequestManagerRename("VirtualRouterRename", "Renames a virtual router") + RequestManagerRename("one.vrouter.rename", "Renames a virtual router") { Nebula& nd = Nebula::instance(); pool = nd.get_vrouterpool(); @@ -365,7 +365,7 @@ class MarketPlaceRename: public RequestManagerRename { public: MarketPlaceRename(): - RequestManagerRename("MarketPlaceRename", "Renames a marketplace") + RequestManagerRename("one.market.rename", "Renames a marketplace") { Nebula& nd = Nebula::instance(); pool = nd.get_marketpool(); @@ -389,7 +389,7 @@ class MarketPlaceAppRename: public RequestManagerRename { public: MarketPlaceAppRename(): - RequestManagerRename("MarketPlaceRename", "Renames a marketplace app") + RequestManagerRename("one.marketapp.rename", "Renames a marketplace app") { Nebula& nd = Nebula::instance(); pool = nd.get_apppool(); @@ -411,7 +411,7 @@ class VMGroupRename: public RequestManagerRename { public: VMGroupRename(): - RequestManagerRename("VMGroupRename", "Renames a vm group") + RequestManagerRename("one.vmgroup.rename", "Renames a vm group") { Nebula& nd = Nebula::instance(); pool = nd.get_vmgrouppool(); diff --git a/include/RequestManagerSecurityGroup.h b/include/RequestManagerSecurityGroup.h index 06798ce77d..a871975ebb 100644 --- a/include/RequestManagerSecurityGroup.h +++ b/include/RequestManagerSecurityGroup.h @@ -23,7 +23,7 @@ class SecurityGroupCommit : public Request { public: - SecurityGroupCommit() : Request("SecurityGroupCommit", "A:sib", + SecurityGroupCommit() : Request("one.secgroup.commit", "A:sib", "Commit security group changes to VMs") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerSystem.h b/include/RequestManagerSystem.h index d4023092dd..6aa79659c6 100644 --- a/include/RequestManagerSystem.h +++ b/include/RequestManagerSystem.h @@ -50,7 +50,7 @@ class SystemVersion : public RequestManagerSystem { public: SystemVersion(): - RequestManagerSystem("SystemVersion", + RequestManagerSystem("one.system.version", "Returns the OpenNebula version", "A:s") {}; @@ -68,7 +68,7 @@ class SystemConfig : public RequestManagerSystem { public: SystemConfig(): - RequestManagerSystem("SystemConfig", + RequestManagerSystem("one.system.config", "Returns the OpenNebula configuration", "A:s") {}; @@ -86,7 +86,7 @@ class UserQuotaInfo : public RequestManagerSystem { public: UserQuotaInfo(): - RequestManagerSystem("UserQuotaInfo", + RequestManagerSystem("one.userquota.info", "Returns the default user quota limits", "A:s") { @@ -106,7 +106,7 @@ class GroupQuotaInfo : public RequestManagerSystem { public: GroupQuotaInfo(): - RequestManagerSystem("GroupQuotaInfo", + RequestManagerSystem("one.groupquota.info", "Returns the default group quota limits", "A:s") { @@ -124,7 +124,7 @@ public: class QuotaUpdate : public RequestManagerSystem { -public: +protected: QuotaUpdate(const string& method_name, const string& help): RequestManagerSystem(method_name, @@ -151,7 +151,7 @@ class UserQuotaUpdate : public QuotaUpdate { public: UserQuotaUpdate(): - QuotaUpdate("UserQuotaUpdate", + QuotaUpdate("one.userquota.update", "Updates the default user quota limits") { auth_op = AuthRequest::ADMIN; @@ -169,7 +169,7 @@ class GroupQuotaUpdate : public QuotaUpdate { public: GroupQuotaUpdate(): - QuotaUpdate("GroupQuotaUpdate", + QuotaUpdate("one.groupquota.update", "Updates the default group quota limits") { auth_op = AuthRequest::ADMIN; diff --git a/include/RequestManagerUpdateDB.h b/include/RequestManagerUpdateDB.h index df92aac85a..3e0c0ddc29 100644 --- a/include/RequestManagerUpdateDB.h +++ b/include/RequestManagerUpdateDB.h @@ -25,7 +25,7 @@ class RequestManagerUpdateDB: public Request { protected: - RequestManagerUpdateDB(): Request("UpdateDB", "A:sis", + RequestManagerUpdateDB(const string& name): Request(name, "A:sis", "Updates the DB object from a XML document") { auth_op = AuthRequest::MANAGE; @@ -94,7 +94,7 @@ protected: class MarketPlaceAppUpdateDB : public RequestManagerUpdateDB { public: - MarketPlaceAppUpdateDB():RequestManagerUpdateDB() + MarketPlaceAppUpdateDB():RequestManagerUpdateDB("one.marketapp.updatedb") { auth_object = PoolObjectSQL::MARKETPLACEAPP; pool = Nebula::instance().get_apppool(); @@ -106,7 +106,7 @@ public: class MarketPlaceUpdateDB : public RequestManagerUpdateDB { public: - MarketPlaceUpdateDB():RequestManagerUpdateDB() + MarketPlaceUpdateDB():RequestManagerUpdateDB("one.market.updatedb") { auth_object = PoolObjectSQL::MARKETPLACE; pool = Nebula::instance().get_marketpool(); diff --git a/include/RequestManagerUpdateTemplate.h b/include/RequestManagerUpdateTemplate.h index 244bf310f9..25c76118f5 100644 --- a/include/RequestManagerUpdateTemplate.h +++ b/include/RequestManagerUpdateTemplate.h @@ -57,7 +57,7 @@ class TemplateUpdateTemplate: public RequestManagerUpdateTemplate { public: TemplateUpdateTemplate(): - RequestManagerUpdateTemplate("TemplateUpdateTemplate", + RequestManagerUpdateTemplate("one.template.update", "Updates a virtual machine template") { Nebula& nd = Nebula::instance(); @@ -75,7 +75,7 @@ class VirtualMachineUpdateTemplate: public RequestManagerUpdateTemplate { public: VirtualMachineUpdateTemplate(): - RequestManagerUpdateTemplate("VirtualMachineUpdateTemplate", + RequestManagerUpdateTemplate("one.vm.update", "Updates a virtual machine user template") { Nebula& nd = Nebula::instance(); @@ -95,7 +95,7 @@ class ImageUpdateTemplate: public RequestManagerUpdateTemplate { public: ImageUpdateTemplate(): - RequestManagerUpdateTemplate("ImageUpdateTemplate", + RequestManagerUpdateTemplate("one.image.update", "Updates an image template") { Nebula& nd = Nebula::instance(); @@ -113,7 +113,7 @@ class HostUpdateTemplate : public RequestManagerUpdateTemplate { public: HostUpdateTemplate(): - RequestManagerUpdateTemplate("HostUpdateTemplate", + RequestManagerUpdateTemplate("one.host.update", "Updates a host template") { Nebula& nd = Nebula::instance(); @@ -132,7 +132,7 @@ class VirtualNetworkUpdateTemplate : public RequestManagerUpdateTemplate { public: VirtualNetworkUpdateTemplate(): - RequestManagerUpdateTemplate("VirtualNetworkUpdateTemplate", + RequestManagerUpdateTemplate("one.vn.update", "Updates a vnet template") { Nebula& nd = Nebula::instance(); @@ -151,7 +151,7 @@ class UserUpdateTemplate : public RequestManagerUpdateTemplate { public: UserUpdateTemplate(): - RequestManagerUpdateTemplate("UserUpdateTemplate", + RequestManagerUpdateTemplate("one.user.update", "Updates a user template") { Nebula& nd = Nebula::instance(); @@ -169,7 +169,7 @@ class DatastoreUpdateTemplate : public RequestManagerUpdateTemplate { public: DatastoreUpdateTemplate(): - RequestManagerUpdateTemplate("DatastoreUpdateTemplate", + RequestManagerUpdateTemplate("one.datastore.update", "Updates a datastore template") { Nebula& nd = Nebula::instance(); @@ -187,7 +187,7 @@ class DocumentUpdateTemplate : public RequestManagerUpdateTemplate { public: DocumentUpdateTemplate(): - RequestManagerUpdateTemplate("DocumentUpdateTemplate", + RequestManagerUpdateTemplate("one.document.update", "Updates a document template") { Nebula& nd = Nebula::instance(); @@ -205,7 +205,7 @@ class ClusterUpdateTemplate : public RequestManagerUpdateTemplate { public: ClusterUpdateTemplate(): - RequestManagerUpdateTemplate("ClusterUpdateTemplate", + RequestManagerUpdateTemplate("one.cluster.update", "Updates a cluster template") { Nebula& nd = Nebula::instance(); @@ -223,7 +223,7 @@ class ZoneUpdateTemplate : public RequestManagerUpdateTemplate { public: ZoneUpdateTemplate(): - RequestManagerUpdateTemplate("ZoneUpdateTemplate", + RequestManagerUpdateTemplate("one.zone.update", "Updates a zone template") { Nebula& nd = Nebula::instance(); @@ -241,7 +241,7 @@ class GroupUpdateTemplate : public RequestManagerUpdateTemplate { public: GroupUpdateTemplate(): - RequestManagerUpdateTemplate("GroupUpdateTemplate", + RequestManagerUpdateTemplate("one.group.update", "Updates a Group template") { Nebula& nd = Nebula::instance(); @@ -259,7 +259,7 @@ class SecurityGroupUpdateTemplate : public RequestManagerUpdateTemplate { public: SecurityGroupUpdateTemplate(): - RequestManagerUpdateTemplate("SecurityGroupUpdateTemplate", + RequestManagerUpdateTemplate("one.secgroup.update", "Updates a security group template") { Nebula& nd = Nebula::instance(); @@ -277,7 +277,7 @@ class VdcUpdateTemplate : public RequestManagerUpdateTemplate { public: VdcUpdateTemplate(): - RequestManagerUpdateTemplate("VdcUpdateTemplate", + RequestManagerUpdateTemplate("one.vdc.update", "Updates a VDC template") { Nebula& nd = Nebula::instance(); @@ -295,7 +295,7 @@ class VirtualRouterUpdateTemplate : public RequestManagerUpdateTemplate { public: VirtualRouterUpdateTemplate(): - RequestManagerUpdateTemplate("VirtualRouterUpdateTemplate", + RequestManagerUpdateTemplate("one.vrouter.update", "Updates a virtual router template") { Nebula& nd = Nebula::instance(); @@ -313,7 +313,7 @@ class MarketPlaceUpdateTemplate : public RequestManagerUpdateTemplate { public: MarketPlaceUpdateTemplate(): - RequestManagerUpdateTemplate("MarketPlaceUpdateTemplate", + RequestManagerUpdateTemplate("one.market.update", "Updates a marketplace template") { Nebula& nd = Nebula::instance(); @@ -331,7 +331,7 @@ class MarketPlaceAppUpdateTemplate : public RequestManagerUpdateTemplate { public: MarketPlaceAppUpdateTemplate(): - RequestManagerUpdateTemplate("MarketPlaceUpdateTemplate", + RequestManagerUpdateTemplate("one.marketapp.update", "Updates a marketplace app template") { Nebula& nd = Nebula::instance(); @@ -349,7 +349,7 @@ class VMGroupUpdateTemplate : public RequestManagerUpdateTemplate { public: VMGroupUpdateTemplate(): - RequestManagerUpdateTemplate("VMGroupUpdateTemplate", + RequestManagerUpdateTemplate("one.vmgroup.update", "Updates a vm group template") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerUser.h b/include/RequestManagerUser.h index 947b11af53..2f71054ebf 100644 --- a/include/RequestManagerUser.h +++ b/include/RequestManagerUser.h @@ -63,7 +63,7 @@ class UserChangePassword : public RequestManagerUser { public: UserChangePassword(): - RequestManagerUser("UserChangePassword", + RequestManagerUser("one.user.passwd", "Changes user's password", "A:sis") { @@ -86,7 +86,7 @@ class UserChangeAuth: public RequestManagerUser { public: UserChangeAuth(): - RequestManagerUser("UserChangeAuth", + RequestManagerUser("one.user.chauth", "Changes user's authentication driver", "A:siss") { @@ -109,7 +109,7 @@ class UserSetQuota : public RequestManagerUser { public: UserSetQuota(): - RequestManagerUser("UserSetQuota", + RequestManagerUser("one.user.quota", "Sets user quota limits", "A:sis") { @@ -130,7 +130,8 @@ public: class UserLogin : public Request { public: - UserLogin(): Request("UserLogin", "A:sssii", "Generates or sets a login token") + UserLogin(): Request("one.user.login", "A:sssii", + "Generates or sets a login token") { Nebula& nd = Nebula::instance(); pool = nd.get_upool(); @@ -194,7 +195,7 @@ class UserAddGroup : public UserEditGroup { public: UserAddGroup(): - UserEditGroup("UserAddGroup", + UserEditGroup("one.user.addgroup", "Adds the user to a secondary group", "A:sii"){}; @@ -214,7 +215,7 @@ class UserDelGroup : public UserEditGroup { public: UserDelGroup(): - UserEditGroup("UserDelGroup", + UserEditGroup("one.user.delgroup", "Deletes the user from a secondary group", "A:sii"){}; diff --git a/include/RequestManagerVMTemplate.h b/include/RequestManagerVMTemplate.h index b5c87b1249..b779a0db04 100644 --- a/include/RequestManagerVMTemplate.h +++ b/include/RequestManagerVMTemplate.h @@ -55,7 +55,7 @@ class VMTemplateInstantiate : public RequestManagerVMTemplate { public: VMTemplateInstantiate(): - RequestManagerVMTemplate("TemplateInstantiate", "Instantiates a new " + RequestManagerVMTemplate("one.template.instantiate", "Instantiates a new " "virtual machine using a template", "A:sisbs") { auth_op = AuthRequest::USE; diff --git a/include/RequestManagerVdc.h b/include/RequestManagerVdc.h index b09f233dcd..738f943e57 100644 --- a/include/RequestManagerVdc.h +++ b/include/RequestManagerVdc.h @@ -64,11 +64,8 @@ protected: class VdcAddGroup : public VdcEditGroup { public: - VdcAddGroup(): - VdcEditGroup( "VdcAddGroup", - "Adds a group to the VDC", - "A:sii", - true){}; + VdcAddGroup():VdcEditGroup("one.vdc.addgroup", "Adds a group to the VDC", + "A:sii", true){}; ~VdcAddGroup(){}; @@ -82,11 +79,8 @@ public: class VdcDelGroup : public VdcEditGroup { public: - VdcDelGroup(): - VdcEditGroup( "VdcDelGroup", - "Deletes a group from the VDC", - "A:sii", - false){}; + VdcDelGroup():VdcEditGroup("one.vdc.delgroup","Deletes a group from the VDC", + "A:sii", false){}; ~VdcDelGroup(){}; @@ -133,8 +127,8 @@ protected: PoolObjectSQL::ObjectType res_obj_type; - virtual int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg) = 0; + virtual int edit_resource(Vdc* vdc, int zone_id, int res_id, + string& error_msg) = 0; }; /* ------------------------------------------------------------------------- */ @@ -143,18 +137,13 @@ protected: class VdcAddCluster : public VdcEditResource { public: - VdcAddCluster(): - VdcEditResource("VdcAddCluster", - "Adds a cluster to the VDC", - "A:siii", - true, - Nebula::instance().get_clpool(), - PoolObjectSQL::CLUSTER){}; + VdcAddCluster():VdcEditResource("one.vdc.addcluster", + "Adds a cluster to the VDC", "A:siii", true, + Nebula::instance().get_clpool(), PoolObjectSQL::CLUSTER){}; ~VdcAddCluster(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -163,18 +152,13 @@ public: class VdcDelCluster : public VdcEditResource { public: - VdcDelCluster(): - VdcEditResource("VdcDelCluster", - "Deletes a cluster from the VDC", - "A:siii", - false, - Nebula::instance().get_clpool(), - PoolObjectSQL::CLUSTER){}; + VdcDelCluster():VdcEditResource("one.vdc.delcluster", + "Deletes a cluster from the VDC", "A:siii", false, + Nebula::instance().get_clpool(), PoolObjectSQL::CLUSTER){}; ~VdcDelCluster(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -183,18 +167,12 @@ public: class VdcAddHost : public VdcEditResource { public: - VdcAddHost(): - VdcEditResource( "VdcAddHost", - "Adds a host to the VDC", - "A:siii", - true, - Nebula::instance().get_hpool(), - PoolObjectSQL::HOST){}; + VdcAddHost(): VdcEditResource("one.vdc.addhost", "Adds a host to the VDC", + "A:siii", true, Nebula::instance().get_hpool(), PoolObjectSQL::HOST){}; ~VdcAddHost(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -203,18 +181,12 @@ public: class VdcDelHost : public VdcEditResource { public: - VdcDelHost(): - VdcEditResource( "VdcDelHost", - "Deletes a host from the VDC", - "A:siii", - false, - Nebula::instance().get_hpool(), - PoolObjectSQL::HOST){}; + VdcDelHost():VdcEditResource("one.vdc.delhost", "Deletes a host from the VDC", + "A:siii", false, Nebula::instance().get_hpool(), PoolObjectSQL::HOST){}; ~VdcDelHost(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -223,18 +195,13 @@ public: class VdcAddDatastore : public VdcEditResource { public: - VdcAddDatastore(): - VdcEditResource( "VdcAddDatastore", - "Adds a datastore to the VDC", - "A:siii", - true, - Nebula::instance().get_dspool(), - PoolObjectSQL::DATASTORE){}; + VdcAddDatastore():VdcEditResource("one.vdc.adddatastore", + "Adds a datastore to the VDC", "A:siii", true, + Nebula::instance().get_dspool(), PoolObjectSQL::DATASTORE){}; ~VdcAddDatastore(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -243,18 +210,13 @@ public: class VdcDelDatastore : public VdcEditResource { public: - VdcDelDatastore(): - VdcEditResource( "VdcDelDatastore", - "Deletes a datastore from the VDC", - "A:siii", - false, - Nebula::instance().get_dspool(), - PoolObjectSQL::DATASTORE){}; + VdcDelDatastore():VdcEditResource("one.vdc.deldatastore", + "Deletes a datastore from the VDC", "A:siii", false, + Nebula::instance().get_dspool(), PoolObjectSQL::DATASTORE){}; ~VdcDelDatastore(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -263,18 +225,13 @@ public: class VdcAddVNet : public VdcEditResource { public: - VdcAddVNet(): - VdcEditResource( "VdcAddVNet", - "Adds a virtual network to the VDC", - "A:siii", - true, - Nebula::instance().get_vnpool(), - PoolObjectSQL::NET){}; + VdcAddVNet():VdcEditResource("one.vdc.addvnet", + "Adds a virtual network to the VDC", "A:siii", true, + Nebula::instance().get_vnpool(), PoolObjectSQL::NET){}; ~VdcAddVNet(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* ------------------------------------------------------------------------- */ @@ -283,22 +240,16 @@ public: class VdcDelVNet : public VdcEditResource { public: - VdcDelVNet(): - VdcEditResource( "VdcDelVNet", - "Deletes a virtual network from the VDC", - "A:siii", - false, - Nebula::instance().get_vnpool(), - PoolObjectSQL::NET){}; + VdcDelVNet(): VdcEditResource("one.vdc.delvnet", + "Deletes a virtual network from the VDC", "A:siii", false, + Nebula::instance().get_vnpool(), PoolObjectSQL::NET){}; ~VdcDelVNet(){}; - int edit_resource( - Vdc* vdc, int zone_id, int res_id, string& error_msg); + int edit_resource(Vdc* vdc, int zone_id, int res_id, string& error_msg); }; /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ - #endif diff --git a/include/RequestManagerVirtualMachine.h b/include/RequestManagerVirtualMachine.h index 3549a05a79..420ba3aa64 100644 --- a/include/RequestManagerVirtualMachine.h +++ b/include/RequestManagerVirtualMachine.h @@ -115,7 +115,7 @@ public: //auth_op is MANAGE for all actions but "resched" and "unresched" //this is dynamically set for each request in the execute method VirtualMachineAction(): - RequestManagerVirtualMachine("VirtualMachineAction", + RequestManagerVirtualMachine("one.vm.action", "Performs an action on a virtual machine", "A:ssi"){}; ~VirtualMachineAction(){}; @@ -131,7 +131,7 @@ class VirtualMachineDeploy : public RequestManagerVirtualMachine { public: VirtualMachineDeploy(): - RequestManagerVirtualMachine("VirtualMachineDeploy", + RequestManagerVirtualMachine("one.vm.deploy", "Deploys a virtual machine", "A:siibi") { @@ -151,7 +151,7 @@ class VirtualMachineMigrate : public RequestManagerVirtualMachine { public: VirtualMachineMigrate(): - RequestManagerVirtualMachine("VirtualMachineMigrate", + RequestManagerVirtualMachine("one.vm.migrate", "Migrates a virtual machine", "A:siibbi"){ auth_op = Nebula::instance().get_vm_auth_op(History::MIGRATE_ACTION); @@ -170,7 +170,7 @@ class VirtualMachineDiskSaveas : public RequestManagerVirtualMachine { public: VirtualMachineDiskSaveas(): - RequestManagerVirtualMachine("VirtualMachineDiskSaveas", + RequestManagerVirtualMachine("one.vm.disksaveas", "Save a disk from virtual machine as a new image", "A:siissi"){ auth_op= Nebula::instance().get_vm_auth_op(History::DISK_SAVEAS_ACTION); @@ -190,7 +190,7 @@ class VirtualMachineMonitoring : public RequestManagerVirtualMachine public: VirtualMachineMonitoring(): - RequestManagerVirtualMachine("VirtualMachineMonitoring", + RequestManagerVirtualMachine("one.vm.monitoring", "Returns the virtual machine monitoring records", "A:si"){ auth_op = AuthRequest::USE; @@ -209,7 +209,7 @@ class VirtualMachineAttach : public RequestManagerVirtualMachine { public: VirtualMachineAttach(): - RequestManagerVirtualMachine("VirtualMachineAttach", + RequestManagerVirtualMachine("one.vm.attach", "Attaches a new disk to the virtual machine", "A:sis"){ auth_op= Nebula::instance().get_vm_auth_op(History::DISK_ATTACH_ACTION); @@ -228,7 +228,7 @@ class VirtualMachineDetach : public RequestManagerVirtualMachine { public: VirtualMachineDetach(): - RequestManagerVirtualMachine("VirtualMachineDetach", + RequestManagerVirtualMachine("one.vm.detach", "Detaches a disk from a virtual machine", "A:sii"){ //Attach & detach are set to the same auth op in OpenNebulaTemplate @@ -248,7 +248,7 @@ class VirtualMachineAttachNic : public RequestManagerVirtualMachine { public: VirtualMachineAttachNic(): - RequestManagerVirtualMachine("VirtualMachineAttachNic", + RequestManagerVirtualMachine("one.vm.attachnic", "Attaches a new NIC to the virtual machine", "A:sis"){ auth_op = Nebula::instance().get_vm_auth_op(History::NIC_ATTACH_ACTION); @@ -279,7 +279,7 @@ class VirtualMachineDetachNic : public RequestManagerVirtualMachine { public: VirtualMachineDetachNic(): - RequestManagerVirtualMachine("VirtualMachineDetachNic", + RequestManagerVirtualMachine("one.vm.detachnic", "Detaches a NIC from a virtual machine", "A:sii"){ //Attach & detach are set to the same auth op in OpenNebulaTemplate @@ -308,7 +308,7 @@ class VirtualMachineResize : public RequestManagerVirtualMachine { public: VirtualMachineResize(): - RequestManagerVirtualMachine("VirtualMachineResize", + RequestManagerVirtualMachine("one.vm.resize", "Changes the capacity of the virtual machine", "A:sisb"){ auth_op = Nebula::instance().get_vm_auth_op(History::RESIZE_ACTION); @@ -327,7 +327,7 @@ class VirtualMachineSnapshotCreate: public RequestManagerVirtualMachine { public: VirtualMachineSnapshotCreate(): - RequestManagerVirtualMachine("VirtualMachineSnapshotCreate", + RequestManagerVirtualMachine("one.vm.snapshotcreate", "Creates a new virtual machine snapshot", "A:sis"){ Nebula& nd = Nebula::instance(); @@ -349,7 +349,7 @@ class VirtualMachineSnapshotRevert: public RequestManagerVirtualMachine { public: VirtualMachineSnapshotRevert(): - RequestManagerVirtualMachine("VirtualMachineSnapshotRevert", + RequestManagerVirtualMachine("one.vm.snapshotrevert", "Reverts a virtual machine to a snapshot", "A:sii"){ Nebula& nd = Nebula::instance(); @@ -371,7 +371,7 @@ class VirtualMachineSnapshotDelete: public RequestManagerVirtualMachine { public: VirtualMachineSnapshotDelete(): - RequestManagerVirtualMachine("VirtualMachineSnapshotDelete", + RequestManagerVirtualMachine("one.vm.snapshotdelete", "Deletes a virtual machine snapshot", "A:sii"){ Nebula& nd = Nebula::instance(); @@ -393,7 +393,7 @@ class VirtualMachineRecover: public RequestManagerVirtualMachine { public: VirtualMachineRecover(): - RequestManagerVirtualMachine("VirtualMachineRecover", + RequestManagerVirtualMachine("one.vm.recover", "Recovers a virtual machine", "A:sii"){}; ~VirtualMachineRecover(){}; @@ -410,7 +410,7 @@ class VirtualMachinePoolCalculateShowback : public RequestManagerVirtualMachine public: VirtualMachinePoolCalculateShowback(): - RequestManagerVirtualMachine("VirtualMachinePoolCalculateShowback", + RequestManagerVirtualMachine("one.vmpool.calculateshowback", "Processes all the history records, and stores the monthly cost" " for each VM", "A:sii") { @@ -435,7 +435,7 @@ class VirtualMachineDiskSnapshotCreate: public RequestManagerVirtualMachine { public: VirtualMachineDiskSnapshotCreate(): - RequestManagerVirtualMachine("VirtualMachineDiskSnapshotCreate", + RequestManagerVirtualMachine("one.vm.disksnapshotcreate", "Creates a new virtual machine disk snapshot", "A:siis"){ Nebula& nd = Nebula::instance(); @@ -461,7 +461,7 @@ class VirtualMachineDiskSnapshotRevert: public RequestManagerVirtualMachine { public: VirtualMachineDiskSnapshotRevert(): - RequestManagerVirtualMachine("VirtualMachineDiskSnapshotRevert", + RequestManagerVirtualMachine("one.vm.disksnapshotrevert", "Reverts disk state to a snapshot", "A:siii"){ Nebula& nd = Nebula::instance(); @@ -483,7 +483,7 @@ class VirtualMachineDiskSnapshotDelete: public RequestManagerVirtualMachine { public: VirtualMachineDiskSnapshotDelete(): - RequestManagerVirtualMachine("VirtualMachineDiskSnapshotDelete", + RequestManagerVirtualMachine("one.vm.disksnapshotdelete", "Deletes a disk snapshot", "A:siii"){ Nebula& nd = Nebula::instance(); @@ -509,7 +509,7 @@ class VirtualMachineUpdateConf: public RequestManagerVirtualMachine { public: VirtualMachineUpdateConf(): - RequestManagerVirtualMachine("VirtualMachineUpdateConf", + RequestManagerVirtualMachine("one.vm.updateconf", "Updates several configuration attributes of a VM", "A:sis"){ auth_op = Nebula::instance().get_vm_auth_op(History::UPDATECONF_ACTION); @@ -528,7 +528,7 @@ class VirtualMachineDiskResize : public RequestManagerVirtualMachine { public: VirtualMachineDiskResize(): - RequestManagerVirtualMachine("VirtualMachineDiskResize", + RequestManagerVirtualMachine("one.vm.diskresize", "Resizes a disk from a virtual machine", "A:siis"){ Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerVirtualNetwork.h b/include/RequestManagerVirtualNetwork.h index c51944815c..00aeadbb3e 100644 --- a/include/RequestManagerVirtualNetwork.h +++ b/include/RequestManagerVirtualNetwork.h @@ -63,7 +63,7 @@ class VirtualNetworkAddAddressRange: public RequestManagerVirtualNetwork { public: VirtualNetworkAddAddressRange(): - RequestManagerVirtualNetwork("VirtualNetworkAddAddressRange", + RequestManagerVirtualNetwork("one.vn.add_ar", "Adds address ranges to a virtual network") { auth_op = AuthRequest::ADMIN; @@ -86,8 +86,10 @@ public: class VirtualNetworkRmAddressRange : public Request { public: + + VirtualNetworkRmAddressRange( - const string& name = "VirtualNetworkRmAddressRange", + const string& name = "one.vn.rm_ar", const string& sign = "A:sii", const string& help = "Removes an address range from a virtual network") : Request(name, sign, help) @@ -112,7 +114,7 @@ class VirtualNetworkFreeAddressRange : public VirtualNetworkRmAddressRange { public: VirtualNetworkFreeAddressRange():VirtualNetworkRmAddressRange( - "VirtualNetworkFreeAddressRange", + "one.vn.free_ar", "A:sii", "Frees a reserved address range from a virtual network") { @@ -139,7 +141,7 @@ class VirtualNetworkUpdateAddressRange: public RequestManagerVirtualNetwork { public: VirtualNetworkUpdateAddressRange(): - RequestManagerVirtualNetwork("VirtualNetworkUpdateAddressRange", + RequestManagerVirtualNetwork("one.vn.update_ar", "Updates address ranges to a virtual network") { auth_op = AuthRequest::MANAGE; @@ -170,7 +172,7 @@ class VirtualNetworkHold : public RequestManagerVirtualNetwork { public: VirtualNetworkHold(): - RequestManagerVirtualNetwork("VirtualNetworkHold", + RequestManagerVirtualNetwork("one.vn.hold", "Holds a virtual network Lease as used"){}; ~VirtualNetworkHold(){}; @@ -190,7 +192,7 @@ class VirtualNetworkRelease : public RequestManagerVirtualNetwork { public: VirtualNetworkRelease(): - RequestManagerVirtualNetwork("VirtualNetworkRelease", + RequestManagerVirtualNetwork("one.vn.release", "Releases a virtual network Lease on hold"){}; ~VirtualNetworkRelease(){}; @@ -209,7 +211,7 @@ public: class VirtualNetworkReserve: public Request { public: - VirtualNetworkReserve():Request("VirtualNetworkReserve", "A:sis", + VirtualNetworkReserve():Request("one.vn.reserve", "A:sis", "Reserve network addresses") { Nebula& nd = Nebula::instance(); diff --git a/include/RequestManagerVirtualRouter.h b/include/RequestManagerVirtualRouter.h index d2deaad781..e5af638b62 100644 --- a/include/RequestManagerVirtualRouter.h +++ b/include/RequestManagerVirtualRouter.h @@ -54,10 +54,9 @@ protected: class VirtualRouterInstantiate : public RequestManagerVirtualRouter { public: - VirtualRouterInstantiate(): - RequestManagerVirtualRouter("VirtualRouterInstantiate", - "Instantiates a new virtual machine associated to a virtual router", - "A:siiisbs") + VirtualRouterInstantiate() : RequestManagerVirtualRouter( + "one.vrouter.instantiate", "Instantiates a new virtual machine " + "associated to a virtual router", "A:siiisbs") { auth_op = AuthRequest::MANAGE; }; @@ -75,10 +74,9 @@ public: class VirtualRouterAttachNic : public RequestManagerVirtualRouter { public: - VirtualRouterAttachNic(): - RequestManagerVirtualRouter("VirtualRouterAttachNic", - "Attaches a new NIC to the virtual router, and its virtual machines", - "A:sis") + VirtualRouterAttachNic():RequestManagerVirtualRouter("one.vrouter.attachnic", + "Attaches a new NIC to the virtual router, and its virtual machines", + "A:sis") { auth_op = AuthRequest::MANAGE; }; @@ -96,10 +94,8 @@ public: class VirtualRouterDetachNic : public RequestManagerVirtualRouter { public: - VirtualRouterDetachNic(): - RequestManagerVirtualRouter("VirtualRouterDetachNic", - "Detaches a NIC from a virtual router, and its virtual machines", - "A:sii") + VirtualRouterDetachNic():RequestManagerVirtualRouter("one.vrouter.detachnic", + "Detaches a NIC from a virtual router, and its virtual machines","A:sii") { auth_op = AuthRequest::MANAGE; }; diff --git a/include/RequestManagerZone.h b/include/RequestManagerZone.h index d2a27bfed4..14c8d0b462 100644 --- a/include/RequestManagerZone.h +++ b/include/RequestManagerZone.h @@ -56,7 +56,8 @@ class ZoneAddServer : public RequestManagerZone { public: ZoneAddServer(): - RequestManagerZone("ZoneAddServer", "Add a server to zone", "A:sis"){}; + RequestManagerZone("one.zone.addserver", "Add a server to zone", + "A:sis"){}; ~ZoneAddServer(){}; @@ -71,7 +72,7 @@ class ZoneDeleteServer : public RequestManagerZone { public: ZoneDeleteServer(): - RequestManagerZone("ZoneDeleteServer", "Delete a server from zone", + RequestManagerZone("one.zone.delserver", "Delete a server from zone", "A:sii"){}; ~ZoneDeleteServer(){}; @@ -87,8 +88,11 @@ class ZoneReplicateLog : public RequestManagerZone { public: ZoneReplicateLog(): - RequestManagerZone("ZoneReplicateLog", "Replicate a log record", - "A:siiiiiiis"){}; + RequestManagerZone("one.zone.replicate", "Replicate a log record", + "A:siiiiiiis") + { + log_method_call = false; + }; ~ZoneReplicateLog(){}; @@ -103,8 +107,8 @@ class ZoneVoteRequest : public RequestManagerZone { public: ZoneVoteRequest(): - RequestManagerZone("ZoneVoteRequest", "Request vote from a candidate", - "A:siiii"){}; + RequestManagerZone("one.zone.voterequest", + "Request vote from a candidate", "A:siiii"){}; ~ZoneVoteRequest(){}; @@ -119,7 +123,7 @@ class ZoneRaftStatus : public RequestManagerZone { public: ZoneRaftStatus(): - RequestManagerZone("ZoneRaftInformation", "Returns Raft status", + RequestManagerZone("one.zone.raftstatus", "Returns Raft status", "A:s"){}; ~ZoneRaftStatus(){}; diff --git a/src/rm/Request.cc b/src/rm/Request.cc index bcf20582bd..f95da92527 100644 --- a/src/rm/Request.cc +++ b/src/rm/Request.cc @@ -283,8 +283,11 @@ void Request::execute( att.gname, att.group_ids, att.umask); - - log_method_invoked(att, _paramList, format_str, method_name, hidden_params); + if ( log_method_call ) + { + log_method_invoked(att, _paramList, format_str, method_name, + hidden_params); + } if ( authenticated == false ) { @@ -295,7 +298,10 @@ void Request::execute( request_execute(_paramList, att); } - log_result(att, method_name); + if ( log_method_call ) + { + log_result(att, method_name); + } }; /* -------------------------------------------------------------------------- */