Added all tariff options.

diff --git a/projects/sgconf/main.cpp b/projects/sgconf/main.cpp
index 3fbafa0aedc13a094467f7a782cb92492490a575..3788a15635469bf3f5f1d408c7de4e8f8b8eaa5b 100644 (file)
--- a/projects/sgconf/main.cpp
+++ b/projects/sgconf/main.cpp
@@ -1092,7 +1092,7 @@ std::cout << "sgconf is the Stargazer management utility.\n\n"
           << "Usage:\n"
           << "\tsgconf [options]\n\n"
           << "General options:\n"
           << "Usage:\n"
           << "\tsgconf [options]\n\n"
           << "General options:\n"

-          << "\t-f, --config <config file>\t\toverride default config file (default: \"~/.config/stg/sgconf.conf\")\n"
+          << "\t-c, --config <config file>\t\toverride default config file (default: \"~/.config/stg/sgconf.conf\")\n"

           << "\t-h, --help\t\t\t\tshow this help and exit\n"
           << "\t-v, --version\t\t\t\tshow version information and exit\n\n";
 UsageConnection();
           << "\t-h, --help\t\t\t\tshow this help and exit\n"
           << "\t-v, --version\t\t\t\tshow version information and exit\n\n";
 UsageConnection();


@@ -1110,7 +1110,7 @@ std::cout << "Connection options:\n"
           << "\t-p, --port <port>\t\t\tport to connect (default: \"5555\")\n"
           << "\t-u, --username <username>\t\tadministrative login (default: \"admin\")\n"
           << "\t-w, --userpass <password>\t\tpassword for administrative login\n"
           << "\t-p, --port <port>\t\t\tport to connect (default: \"5555\")\n"
           << "\t-u, --username <username>\t\tadministrative login (default: \"admin\")\n"
           << "\t-w, --userpass <password>\t\tpassword for administrative login\n"

-          << "\t-c, --connect <connection string>\tconnection params as a single string in format: <login>:<password>@<host>:<port>\n\n";
+          << "\t-a, --address <connection string>\tconnection params as a single string in format: <login>:<password>@<host>:<port>\n\n";

 }
 //-----------------------------------------------------------------------------
 void UsageAdmins()
 }
 //-----------------------------------------------------------------------------
 void UsageAdmins()


@@ -1118,16 +1118,16 @@ void UsageAdmins()
 std::cout << "Admins management options:\n"
           << "\t--get-admins\t\t\t\tget a list of admins (subsequent options will define what to show)\n"
           << "\t\t--login\t\t\t\tshow admin's login\n"
 std::cout << "Admins management options:\n"
           << "\t--get-admins\t\t\t\tget a list of admins (subsequent options will define what to show)\n"
           << "\t\t--login\t\t\t\tshow admin's login\n"

-          << "\t\t--priv\t\t\t\tshow admin's priviledges\n"
+          << "\t\t--priv\t\t\t\tshow admin's priviledges\n\n"

           << "\t--get-admin\t\t\t\tget the information about admin\n"
           << "\t--get-admin\t\t\t\tget the information about admin\n"

-          << "\t\t--login <login>\t\t\t\tlogin of the admin to show\n"
-          << "\t\t--priv\t\t\t\tshow admin's priviledges\n"
+          << "\t\t--login <login>\t\t\tlogin of the admin to show\n"
+          << "\t\t--priv\t\t\t\tshow admin's priviledges\n\n"

           << "\t--add-admin\t\t\t\tadd a new admin\n"
           << "\t\t--login <login>\t\t\tlogin of the admin to add\n"
           << "\t\t--password <password>\t\tpassword of the admin to add\n"
           << "\t--add-admin\t\t\t\tadd a new admin\n"
           << "\t\t--login <login>\t\t\tlogin of the admin to add\n"
           << "\t\t--password <password>\t\tpassword of the admin to add\n"

-          << "\t\t--priv <priv number>\t\tpriviledges of the admin to add\n"
+          << "\t\t--priv <priv number>\t\tpriviledges of the admin to add\n\n"

           << "\t--del-admin\t\t\t\tdelete an existing admin\n"
           << "\t--del-admin\t\t\t\tdelete an existing admin\n"

-          << "\t\t--login <login>\t\t\tlogin of the admin to delete\n"
+          << "\t\t--login <login>\t\t\tlogin of the admin to delete\n\n"

           << "\t--chg-admin\t\t\t\tchange an existing admin\n"
           << "\t\t--login <login>\t\t\tlogin of the admin to change\n"
           << "\t\t--priv <priv number>\t\tnew priviledges\n\n";
           << "\t--chg-admin\t\t\t\tchange an existing admin\n"
           << "\t\t--login <login>\t\t\tlogin of the admin to change\n"
           << "\t\t--priv <priv number>\t\tnew priviledges\n\n";


@@ -1137,11 +1137,50 @@ void UsageTariffs()
 {
 std::cout << "Tariffs management options:\n"
           << "\t--get-tariffs\t\t\t\tget a list of tariffs (subsequent options will define what to show)\n"
 {
 std::cout << "Tariffs management options:\n"
           << "\t--get-tariffs\t\t\t\tget a list of tariffs (subsequent options will define what to show)\n"

+          << "\t\t--name\t\t\t\tshow tariff's name\n"
+          << "\t\t--fee\t\t\t\tshow tariff's fee\n"
+          << "\t\t--free\t\t\t\tshow tariff's prepaid traffic in terms of cost\n"
+          << "\t\t--passive-cost\t\t\tshow tariff's cost of \"freeze\"\n"
+          << "\t\t--traff-type\t\t\tshow what type of traffix will be accounted by the tariff\n"
+          << "\t\t--dirs\t\t\t\tshow tarification rules for directions\n\n"

           << "\t--get-tariff\t\t\t\tget the information about tariff\n"
           << "\t--get-tariff\t\t\t\tget the information about tariff\n"

+          << "\t\t--name <name>\t\t\tname of the tariff to show\n"
+          << "\t\t--fee\t\t\t\tshow tariff's fee\n"
+          << "\t\t--free\t\t\t\tshow tariff's prepaid traffic in terms of cost\n"
+          << "\t\t--passive-cost\t\t\tshow tariff's cost of \"freeze\"\n"
+          << "\t\t--traff-type\t\t\tshow what type of traffix will be accounted by the tariff\n"
+          << "\t\t--dirs\t\t\t\tshow tarification rules for directions\n\n"

           << "\t--add-tariff\t\t\t\tadd a new tariff\n"
           << "\t--add-tariff\t\t\t\tadd a new tariff\n"

+          << "\t\t--name <name>\t\t\tname of the tariff to add\n"
+          << "\t\t--fee <fee>\t\t\tstariff's fee\n"
+          << "\t\t--free <free>\t\t\ttariff's prepaid traffic in terms of cost\n"
+          << "\t\t--passive-cost <cost>\t\ttariff's cost of \"freeze\"\n"
+          << "\t\t--traff-type <type>\t\twhat type of traffi will be accounted by the tariff\n"
+          << "\t\t--times <times>\t\t\tslash-separated list of \"day\" time-spans (in form \"hh:mm-hh:mm\") for each direction\n"
+          << "\t\t--prices-day-a <prices>\t\tslash-separated list of prices for \"day\" traffic before threshold for each direction\n"
+          << "\t\t--prices-night-a <prices>\tslash-separated list of prices for \"night\" traffic before threshold for each direction\n"
+          << "\t\t--prices-day-b <prices>\t\tslash-separated list of prices for \"day\" traffic after threshold for each direction\n"
+          << "\t\t--prices-night-b <prices>\tslash-separated list of prices for \"night\" traffic after threshold for each direction\n"
+          << "\t\t--single-prices <yes|no>\tslash-separated list of \"single price\" flags for each direction\n"
+          << "\t\t--no-discounts <yes|no>\t\tslash-separated list of \"no discount\" flags for each direction\n"
+          << "\t\t--thresholds <thresholds>\tslash-separated list of thresholds (in Mb) for each direction\n\n"

           << "\t--del-tariff\t\t\t\tdelete an existing tariff\n"
           << "\t--del-tariff\t\t\t\tdelete an existing tariff\n"

+          << "\t\t--name <name>\t\t\tname of the tariff to delete\n\n"

           << "\t--chg-tariff\t\t\t\tchange an existing tariff\n"
           << "\t--chg-tariff\t\t\t\tchange an existing tariff\n"

-          << "\n\n";
+          << "\t\t--name <name>\t\t\tname of the tariff to change\n"
+          << "\t\t--fee <fee>\t\t\tstariff's fee\n"
+          << "\t\t--free <free>\t\t\ttariff's prepaid traffic in terms of cost\n"
+          << "\t\t--passive-cost <cost>\t\ttariff's cost of \"freeze\"\n"
+          << "\t\t--traff-type <type>\t\twhat type of traffix will be accounted by the tariff\n"
+          << "\t\t--dir <N>\t\t\tnumber of direction data to change\n"
+          << "\t\t\t--time <time>\t\t\"day\" time-span (in form \"hh:mm-hh:mm\")\n"
+          << "\t\t\t--price-day-a <price>\tprice for \"day\" traffic before threshold\n"
+          << "\t\t\t--price-night-a <price>\tprice for \"night\" traffic before threshold\n"
+          << "\t\t\t--price-day-b <price>\tprice for \"day\" traffic after threshold\n"
+          << "\t\t\t--price-night-b <price>\tprice for \"night\" traffic after threshold\n"
+          << "\t\t\t--single-price <yes|no>\t\"single price\" flag\n"
+          << "\t\t\t--no-discount <yes|no>\t\"no discount\" flag\n"
+          << "\t\t\t--threshold <threshold>\tthreshold (in Mb)\n\n";

 }
 //-----------------------------------------------------------------------------
 void UsageUsers()
 }
 //-----------------------------------------------------------------------------
 void UsageUsers()


@@ -1161,11 +1200,27 @@ void UsageServices()
 {
 std::cout << "Services management options:\n"
           << "\t--get-services\t\t\t\tget a list of services (subsequent options will define what to show)\n"
 {
 std::cout << "Services management options:\n"
           << "\t--get-services\t\t\t\tget a list of services (subsequent options will define what to show)\n"

+          << "\t\t--name\t\t\t\tshow service's name\n"
+          << "\t\t--comment\t\t\tshow a comment to the service\n"
+          << "\t\t--cost\t\t\t\tshow service's cost\n"
+          << "\t\t--pay-day\t\t\tshow service's pay day\n\n"

           << "\t--get-service\t\t\t\tget the information about service\n"
           << "\t--get-service\t\t\t\tget the information about service\n"

+          << "\t\t--name <name>\t\t\tname of the service to show\n"
+          << "\t\t--comment\t\t\tshow a comment to the service\n"
+          << "\t\t--cost\t\t\t\tshow service's cost\n"
+          << "\t\t--pay-day\t\t\tshow service's pay day\n\n"

           << "\t--add-service\t\t\t\tadd a new service\n"
           << "\t--add-service\t\t\t\tadd a new service\n"

+          << "\t\t--name <name>\t\t\tname of the service to add\n"
+          << "\t\t--comment <comment>\t\ta comment to the service\n"
+          << "\t\t--cost <cost>\t\t\tservice's cost\n"
+          << "\t\t--pay-day <day>\t\t\tservice's pay day\n\n"

           << "\t--del-service\t\t\t\tdelete an existing service\n"
           << "\t--del-service\t\t\t\tdelete an existing service\n"

+          << "\t\t--name <name>\t\t\tname of the service to delete\n\n"

           << "\t--chg-service\t\t\t\tchange an existing service\n"
           << "\t--chg-service\t\t\t\tchange an existing service\n"

-          << "\n\n";
+          << "\t\t--name <name>\t\t\tname of the service to change\n"
+          << "\t\t--comment <comment>\t\ta comment to the service\n"
+          << "\t\t--cost <cost>\t\t\tservice's cost\n"
+          << "\t\t--pay-day <day>\t\t\tservice's pay day\n\n";

 }
 //-----------------------------------------------------------------------------
 void UsageCorporations()
 }
 //-----------------------------------------------------------------------------
 void UsageCorporations()


@@ -1173,20 +1228,19 @@ void UsageCorporations()
 std::cout << "Corporations management options:\n"
           << "\t--get-corporations\t\t\tget a list of corporations (subsequent options will define what to show)\n"
           << "\t\t--name\t\t\t\tshow corporation's name\n"
 std::cout << "Corporations management options:\n"
           << "\t--get-corporations\t\t\tget a list of corporations (subsequent options will define what to show)\n"
           << "\t\t--name\t\t\t\tshow corporation's name\n"

-          << "\t\t--cash\t\t\t\tshow corporation's cash\n"
+          << "\t\t--cash\t\t\t\tshow corporation's cash\n\n"

           << "\t--get-corp\t\t\t\tget the information about corporation\n"
           << "\t\t--name <name>\t\t\tname of the corporation to show\n"
           << "\t--get-corp\t\t\t\tget the information about corporation\n"
           << "\t\t--name <name>\t\t\tname of the corporation to show\n"

-          << "\t\t--cash\t\t\t\tshow corporation's cash\n"
+          << "\t\t--cash\t\t\t\tshow corporation's cash\n\n"

           << "\t--add-corp\t\t\t\tadd a new corporation\n"
           << "\t\t--name <name>\t\t\tname of the corporation to add\n"
           << "\t--add-corp\t\t\t\tadd a new corporation\n"
           << "\t\t--name <name>\t\t\tname of the corporation to add\n"

-          << "\t\t--cash <cash>\t\t\tinitial corporation's cash (default: \"0\")\n"
+          << "\t\t--cash <cash>\t\t\tinitial corporation's cash (default: \"0\")\n\n"

           << "\t--del-corp\t\t\t\tdelete an existing corporation\n"
           << "\t--del-corp\t\t\t\tdelete an existing corporation\n"

-          << "\t\t--name <name>\t\t\tname of the corporation to delete\n"
+          << "\t\t--name <name>\t\t\tname of the corporation to delete\n\n"

           << "\t--chg-corp\t\t\t\tchange an existing corporation\n"
           << "\t\t--name <name>\t\t\tname of the corporation to change\n"
           << "\t\t--add-cash <amount>[:<message>]\tadd cash to the corporation's account and optional comment message\n"
           << "\t--chg-corp\t\t\t\tchange an existing corporation\n"
           << "\t\t--name <name>\t\t\tname of the corporation to change\n"
           << "\t\t--add-cash <amount>[:<message>]\tadd cash to the corporation's account and optional comment message\n"

-          << "\t\t--set-cash <cash>[:<message>]\tnew corporation's cash and optional comment message\n"
-          << "\n\n";
+          << "\t\t--set-cash <cash>[:<message>]\tnew corporation's cash and optional comment message\n\n";

 }
 
 } // namespace anonymous
 }
 
 } // namespace anonymous