Strip AFSVol prefixes from RPC call names in volumeserver.xg

Strip AFSVol prefixes from RPC call names in volumeserver.xg as they're
redundant given that the the xg compiler prefixes them with the package name.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/rpc-api/volumeserver.xg b/rpc-api/volumeserver.xg
index 28f7ea95ddc87969484183056f6bdf51cbfa8b0b..0e7e9b45ea0d8fd92b46d3c87399099256f4267e 100644 (file)
--- a/rpc-api/volumeserver.xg
+++ b/rpc-api/volumeserver.xg
@@ -275,113 +275,113 @@ const AFS_MAX_DESTINATIONS = 255;
 
 typedef replica manyDests<AFS_MAX_DESTINATIONS>;
 
-AFSVolCreateVolume(IN uint32_t partition,
-                  IN string name<>,
-                  IN uint32_t type,
-                  IN uint32_t parent,
-                  INOUT uint32_t *volid,
-                  OUT uint32_t *trans) = VOLCREATEVOLUME;
+CreateVolume(IN uint32_t partition,
+            IN string name<>,
+            IN uint32_t type,
+            IN uint32_t parent,
+            INOUT uint32_t *volid,
+            OUT uint32_t *trans) = VOLCREATEVOLUME;
 
-AFSVolDeleteVolume(IN uint32_t trans) = VOLDELETEVOLUME;
+DeleteVolume(IN uint32_t trans) = VOLDELETEVOLUME;
 
-AFSVolNukeVolume(IN uint32_t partID,
-                IN uint32_t volID) = VOLNUKEVOLUME;
+NukeVolume(IN uint32_t partID,
+          IN uint32_t volID) = VOLNUKEVOLUME;
 
-AFSVolDump(IN uint32_t fromTrans,
-          IN uint32_t fromDate) split = VOLDUMP;
+Dump(IN uint32_t fromTrans,
+     IN uint32_t fromDate) split = VOLDUMP;
 
-AFSVolSignalRestore(IN string name<>,
-                   IN int32_t type,
-                   IN uint32_t pid,
-                   IN uint32_t cloneid) = VOLSIGNALRESTORE;
+SignalRestore(IN string name<>,
+             IN int32_t type,
+             IN uint32_t pid,
+             IN uint32_t cloneid) = VOLSIGNALRESTORE;
 
-AFSVolRestore(IN uint32_t toTrans,
-             IN uint32_t flags,
-             IN restoreCookie *cookie) split = VOLRESTORE;
+Restore(IN uint32_t toTrans,
+       IN uint32_t flags,
+       IN restoreCookie *cookie) split = VOLRESTORE;
 
-AFSVolForward(IN int32_t fromTrans,
-             IN int32_t fromData,
-             IN destServer *destination,
-             IN uint32_t destTrans,
-             IN restoreCookie *cookie) = VOLFORWARD;
+Forward(IN int32_t fromTrans,
+       IN int32_t fromData,
+       IN destServer *destination,
+       IN uint32_t destTrans,
+       IN restoreCookie *cookie) = VOLFORWARD;
 
-AFSVolClone(IN uint32_t trans,
-           IN uint32_t purgeVol,
-           IN uint32_t newType,
-           IN string newName<>,
-           INOUT uint32_t *newVol) = VOLCLONE;
+Clone(IN uint32_t trans,
+      IN uint32_t purgeVol,
+      IN uint32_t newType,
+      IN string newName<>,
+      INOUT uint32_t *newVol) = VOLCLONE;
 
-AFSVolReClone(IN uint32_t tid,
-             IN uint32_t cloneID) = VOLRECLONE;
+ReClone(IN uint32_t tid,
+       IN uint32_t cloneID) = VOLRECLONE;
 
-AFSVolSetForwarding(IN uint32_t tid,
-                   IN uint32_t newsite) = VOLSETFORWARDING;
+SetForwarding(IN uint32_t tid,
+             IN uint32_t newsite) = VOLSETFORWARDING;
 
-AFSVolTransCreate(IN uint32_t volume,
-                 IN uint32_t partition,
-                 IN uint32_t flags,
-                 OUT uint32_t *trans) = VOLTRANSCREATE;
+TransCreate(IN uint32_t volume,
+           IN uint32_t partition,
+           IN uint32_t flags,
+           OUT uint32_t *trans) = VOLTRANSCREATE;
 
-AFSVolEndTrans(IN uint32_t trans,
-              OUT uint32_t *rcode) = VOLENDTRANS;
+EndTrans(IN uint32_t trans,
+        OUT uint32_t *rcode) = VOLENDTRANS;
 
-AFSVolGetFlags(IN uint32_t trans,
-              OUT uint32_t *flags) = VOLGETFLAGS;
+GetFlags(IN uint32_t trans,
+        OUT uint32_t *flags) = VOLGETFLAGS;
 
-AFSVolSetFlags(IN uint32_t trans,
-              IN uint32_t flags) = VOLSETFLAGS;
+SetFlags(IN uint32_t trans,
+        IN uint32_t flags) = VOLSETFLAGS;
 
-AFSVolGetName(IN uint32_t tid,
-             OUT string tname<256>) = VOLGETNAME;
+GetName(IN uint32_t tid,
+       OUT string tname<256>) = VOLGETNAME;
 
-AFSVolGetStatus(IN uint32_t tid,
-               OUT volser_status *status) = VOLGETSTATUS;
+GetStatus(IN uint32_t tid,
+         OUT volser_status *status) = VOLGETSTATUS;
 
-AFSVolSetIdsTypes(IN uint32_t tId,
-                 IN string name<>,
-                 IN uint32_t type,
-                 IN uint32_t pId,
-                 IN uint32_t cloneId,
-                 IN uint32_t backupId) = VOLSETIDTYPES;
+SetIdsTypes(IN uint32_t tId,
+           IN string name<>,
+           IN uint32_t type,
+           IN uint32_t pId,
+           IN uint32_t cloneId,
+           IN uint32_t backupId) = VOLSETIDTYPES;
 
-AFSVolSetDate(IN uint32_t tid,
-             IN uint32_t newDate) = VOLSETDATE;
+SetDate(IN uint32_t tid,
+       IN uint32_t newDate) = VOLSETDATE;
 
-AFSVolListPartitions(OUT pIDs *partIDs) = VOLLISTPARTITIONS;
+ListPartitions(OUT pIDs *partIDs) = VOLLISTPARTITIONS;
 
-AFSVolPartitionInfo(IN string name<>,
-                   OUT diskPartition *partition) = VOLPARTITIONINFO;
+PartitionInfo(IN string name<>,
+             OUT diskPartition *partition) = VOLPARTITIONINFO;
 
-AFSVolListVolumes(IN uint32_t partID,
-                 IN uint32_t flags,
-                 OUT volEntries *resultEntries) = VOLLISTVOLUMES;
+ListVolumes(IN uint32_t partID,
+           IN uint32_t flags,
+           OUT volEntries *resultEntries) = VOLLISTVOLUMES;
 
-AFSVolListOneVolume(IN uint32_t partID,
-                   IN uint32_t volid,
-                   OUT volEntries *resultEntries) = VOLLISTONEVOLUME;
+ListOneVolume(IN uint32_t partID,
+             IN uint32_t volid,
+             OUT volEntries *resultEntries) = VOLLISTONEVOLUME;
 
-AFSVolGetNthVolume(IN uint32_t index,
-                  OUT uint32_t *volume,
-                  OUT uint32_t *partition) = VOLGETNTHVOLUME;
+GetNthVolume(IN uint32_t index,
+            OUT uint32_t *volume,
+            OUT uint32_t *partition) = VOLGETNTHVOLUME;
 
-AFSVolMonitor(OUT transDebugEntries *result) = VOLMONITOR;
+Monitor(OUT transDebugEntries *result) = VOLMONITOR;
 
-AFSVolXListVolumes(IN uint32_t partID,
-                  IN uint32_t flags,
-                  OUT xvolEntries *resultEntries) = VOLXLISTVOLUMES;
+XListVolumes(IN uint32_t partID,
+            IN uint32_t flags,
+            OUT xvolEntries *resultEntries) = VOLXLISTVOLUMES;
 
-AFSVolXListOneVolume(IN uint32_t partID,
-                    IN uint32_t volid,
-                    OUT xvolEntries *resultEntries) = VOLXLISTONEVOL;
+XListOneVolume(IN uint32_t partID,
+              IN uint32_t volid,
+              OUT xvolEntries *resultEntries) = VOLXLISTONEVOL;
 
-AFSVolSetInfo(IN uint32_t transid,
-             IN volintInfo *volinfo) = VOLSETINFO;
+SetInfo(IN uint32_t transid,
+       IN volintInfo *volinfo) = VOLSETINFO;
 
-AFSVolXListPartitions(OUT part_entries *ent) = VOLXLISTPARTITIONS;
+XListPartitions(OUT part_entries *ent) = VOLXLISTPARTITIONS;
 
-AFSVolForwardMultiple(IN int32_t fromTrans,
-                     IN int32_t fromData,
-                     IN manyDests *destinations,
-                     IN uint32_t spare0,
-                     IN restoreCookie *cookie,
-                     OUT multi_results *results) = VOLFORWARDMULTIPLE;
+ForwardMultiple(IN int32_t fromTrans,
+               IN int32_t fromData,
+               IN manyDests *destinations,
+               IN uint32_t spare0,
+               IN restoreCookie *cookie,
+               OUT multi_results *results) = VOLFORWARDMULTIPLE;

diff --git a/suite/commands/vos/examine.py b/suite/commands/vos/examine.py
index 253fbd92a4ff73c4a273fb0525627934c902fc47..dc151a3fd34f03954de346f4ce9fa87230e288c8 100644 (file)
--- a/suite/commands/vos/examine.py
+++ b/suite/commands/vos/examine.py
@@ -126,9 +126,9 @@ def main(params):
         vol_server = volserver(vldb.serverNumber[i])
         vol_conn = cell.open_volume_server(vol_server, params)
         if "extended" in params:
-            ret = kafs.VOLSER_AFSVolXListOneVolume(vol_conn, vldb.serverPartition[i], volid)
+            ret = kafs.VOLSER_XListOneVolume(vol_conn, vldb.serverPartition[i], volid)
         else:
-            ret = kafs.VOLSER_AFSVolListOneVolume(vol_conn, vldb.serverPartition[i], volid)
+            ret = kafs.VOLSER_ListOneVolume(vol_conn, vldb.serverPartition[i], volid)
         params["server"] = vol_server
         params["_partname"] = id2part(vldb.serverPartition[i])
         vol = ret.resultEntries[0]

diff --git a/suite/commands/vos/listpart.py b/suite/commands/vos/listpart.py
index 1f74b66cbd718b8cb894653d8e2a384c7a316c7f..37e08d9e89ea47ee13c95feccd0843556ec83ba2 100644 (file)
--- a/suite/commands/vos/listpart.py
+++ b/suite/commands/vos/listpart.py
@@ -51,7 +51,7 @@ def main(params):
     cell = params["cell"]
     vol_conn = cell.open_volume_server(params["server"], params)
 
-    ret = kafs.VOLSER_AFSVolListPartitions(vol_conn)
+    ret = kafs.VOLSER_ListPartitions(vol_conn)
     partitions = ret.partIDs.partIds
 
     output("The partitions on the server are:\n");

diff --git a/suite/commands/vos/listvol.py b/suite/commands/vos/listvol.py
index 704bd336c98f04eb1c17090efda1efa8ba083be4..8fe520161cbfe267c238e3ece899474cdad27519 100644 (file)
--- a/suite/commands/vos/listvol.py
+++ b/suite/commands/vos/listvol.py
@@ -102,9 +102,9 @@ def display_format_extended(params, vol):
 ###############################################################################
 def display_one_partition(params, vol_conn, partition):
     if "extended" in params:
-        ret = kafs.VOLSER_AFSVolXListVolumes(vol_conn, partition, 1)
+        ret = kafs.VOLSER_XListVolumes(vol_conn, partition, 1)
     else:
-        ret = kafs.VOLSER_AFSVolListVolumes(vol_conn, partition, 1)
+        ret = kafs.VOLSER_ListVolumes(vol_conn, partition, 1)
 
     params["_partname"] = partname = id2part(partition)
     if "quiet" not in params:
@@ -162,6 +162,6 @@ def main(params):
             error("vos : partition ", params["raw.partition"][0],
                   " does not exist on the server")
     else:
-        ret = kafs.VOLSER_AFSVolXListPartitions(vol_conn)
+        ret = kafs.VOLSER_XListPartitions(vol_conn)
         for p in ret.ent:
             one_partition(params, vol_conn, p)

diff --git a/suite/commands/vos/partinfo.py b/suite/commands/vos/partinfo.py
index 2472ade72eab8c14ae8f01028daa5f54b07e1544..c7f44271055316dbc4e0c410a42cd2ea8d9a6a07 100644 (file)
--- a/suite/commands/vos/partinfo.py
+++ b/suite/commands/vos/partinfo.py
@@ -54,7 +54,7 @@ def main(params):
     vol_conn = cell.open_volume_server(params["server"], params)
 
     if "partition" not in params:
-        ret = kafs.VOLSER_AFSVolListPartitions(vol_conn)
+        ret = kafs.VOLSER_ListPartitions(vol_conn)
         partitions = ret.partIDs.partIds
     else:
         partitions = [ params["partition"] ]
@@ -64,7 +64,7 @@ def main(params):
             partname = partition.id2part(i)
 
             try:
-                ret = kafs.VOLSER_AFSVolPartitionInfo(vol_conn, partname)
+                ret = kafs.VOLSER_PartitionInfo(vol_conn, partname)
                 part = ret.partition
 
                 output("Free space on partition ", part.name, ": ",

diff --git a/suite/commands/vos/status.py b/suite/commands/vos/status.py
index 07a7bb826f33c5e18fd095b76b5575a32d321443..463ba816f61da6811c9428ac24ad5a7ac253fc57 100644 (file)
--- a/suite/commands/vos/status.py
+++ b/suite/commands/vos/status.py
@@ -52,7 +52,7 @@ def main(params):
     cell = params["cell"]
     vol_conn = cell.open_volume_server(params["server"], params)
 
-    ret = kafs.VOLSER_AFSVolMonitor(vol_conn)
+    ret = kafs.VOLSER_Monitor(vol_conn)
     results = ret.result
     if len(results) == 0:
         output("No active transactions on", params["server"].name(), "\n")