cyclades: Rename quotas management commands

Rename 'cyclades-reconcile-commissions' to 'reconcile-commissions-cyclades.'
Rename 'cyclades-usage-verify' to 'reconcile-resources-cyclades.'

Changelog

@@ -27,6 +27,12 @@ Cyclades
 * Remove 'CYCLADES_USER_CATALOG_URL' and 'CYCLADES_USER_FEEDBACK_URL' settings
 * Remove CYCLADES_USE_QUOTAHOLDER, CYCLADES_QUOTAHOLDER_TOKEN,
   CYCLADES_QUOTAHOLDER_URL, CYCLADES_QUOTAHOLDER_POOLSIZE settings
+* Rename 'cyclades-usage-verify' management command to
+  'reconcile-resources-cyclades'. Also, remove 'cyclades-usage-reset' command,
+  which is equivalent to 'reconcile-resources-cyclades --fix'.
+* Rename 'cyclades-reconcile-commissions' management command to
+  'reconcile-commissions-cyclades'.
+
 
 Pithos
 ------

docs/quick-install-admin-guide.rst

@@ -2004,7 +2004,7 @@ Apply Quotas
    node1 # snf-manage astakos-quota --verify
    node1 # snf-manage astakos-quota --sync
    node2 # snf-manage pithos-reset-usage
-   node1 # snf-manage cyclades-reset-usage
+   node1 # snf-manage reconcile-resources-cyclades --fix
 
 If all the above return successfully, then you have finished with the Cyclades
 and Plankton installation and setup.

snf-cyclades-app/synnefo/quotas/management/commands/cyclades-reconcile-commissions.py → snf-cyclades-app/synnefo/quotas/management/commands/reconcile-commissions-cyclades.py

-# Copyright 2012 GRNET S.A. All rights reserved.
+# Copyright 2012-2013 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -38,7 +38,7 @@ from synnefo import quotas
 
 
 class Command(BaseCommand):
-    help = "Reconcile quotas with Quotaholder"
+    help = "Detect and resolve pending commissions to Quotaholder"
     output_transaction = True
     option_list = BaseCommand.option_list + (
         make_option("--fix", dest="fix",

snf-cyclades-app/synnefo/quotas/management/commands/cyclades-usage-verify.py → snf-cyclades-app/synnefo/quotas/management/commands/reconcile-resources-cyclades.py

@@ -43,9 +43,9 @@ from synnefo.settings import CYCLADES_ASTAKOS_SERVICE_TOKEN as ASTAKOS_TOKEN
 
 
 class Command(BaseCommand):
-    help = """Reconcile quotas of Astakos with Cyclades DB.
+    help = """Reconcile resource usage of Astakos with Cyclades DB.
 
-    Detect unsynchronized quotas between Astakos and Cyclades DB and
+    Detect unsynchronized usage between Astakos and Cyclades DB resources and
     synchronize them if specified so.
 
     """