Merge pull request #39 from cloudfoundry-incubator/develop

Develop

Author: boyang9527

src/cli/commands/retrieve_history.go

@@ -17,7 +17,7 @@ type HistoryCommand struct {
 	RequiredlArgs HistoryPositionalArgs `positional-args:"yes"`
 	StartTime     string                `long:"start" description:"start time of metrics collected with format \"yyyy-MM-ddTHH:mm:ss+/-HH:mm\" or \"yyyy-MM-ddTHH:mm:ssZ\", default to very beginning if not specified."`
 	EndTime       string                `long:"end" description:"end time of the metrics collected with format \"yyyy-MM-ddTHH:mm:ss+/-HH:mm\" or \"yyyy-MM-ddTHH:mm:ssZ\", default to current time if not speficied."`
-	RecordNumber  string                `long:"number" short:"n" description:"number of the records will be returned, default one page if not speficied, will be ignored if both start time and end time are specified."`
+	RecordNumber  string                `long:"number" short:"n" description:"the number of the records to return, will be ignored if both start time and end time are specified."`
 	Desc          bool                  `long:"desc" description:"display in descending order, default to ascending order if not specified."`
 	Output        string                `long:"output" description:"dump the policy to a file in JSON format"`
 }

src/cli/commands/retrieve_metrics.go

@@ -17,7 +17,7 @@ type MetricsCommand struct {
 	RequiredlArgs MetricsPositionalArgs `positional-args:"yes"`
 	StartTime     string                `long:"start" description:"start time of metrics collected with format \"yyyy-MM-ddTHH:mm:ss+/-HH:mm\" or \"yyyy-MM-ddTHH:mm:ssZ\", default to very beginning if not specified."`
 	EndTime       string                `long:"end" description:"end time of the metrics collected with format \"yyyy-MM-ddTHH:mm:ss+/-HH:mm\" or \"yyyy-MM-ddTHH:mm:ssZ\", default to current time if not speficied."`
-	RecordNumber  string                `long:"number" short:"n" description:"number of the records will be returned, default one page if not speficied, will be ignored if both start time and end time are specified."`
+	RecordNumber  string                `long:"number" short:"n" description:"the number of the records to return, will be ignored if both start time and end time are specified."`
 	Desc          bool                  `long:"desc" description:"display in descending order, default to ascending order if not specified."`
 	Output        string                `long:"output" description:"dump the policy to a file in JSON format"`
 }

src/cli/main.go

@@ -65,16 +65,17 @@ OPTIONS:
 				Alias:    "asm",
 				HelpText: "Retrieve the metrics of an application",
 				UsageDetails: plugin.Usage{
-					Usage: `cf autoscaling-metrics APP_NAME METRIC_NAME [--start START_TIME] [--end END_TIME] [--desc] [--output PATH_TO_FILE]
+					Usage: `cf autoscaling-metrics APP_NAME METRIC_NAME [--start START_TIME] [--end END_TIME] [--number NUMBER] [--desc] [--output PATH_TO_FILE]
 
 METRIC_NAME: 
 	memoryused, memoryutil, responsetime, throughput, cpu.	
 
 OPTIONS:
-	--start					Start time of metrics collected with format "yyyy-MM-ddTHH:mm:ss+/-HH:mm" or "yyyy-MM-ddTHH:mm:ssZ", default to very beginning if not specified.
-	--end					End time of the metrics collected with format "yyyy-MM-ddTHH:mm:ss+/-HH:mm" or "yyyy-MM-ddTHH:mm:ssZ", default to current time if not speficied.
-	--desc					Display in descending order, default to ascending order if not specified.
-	--output				Dump the metrics to a file in table format.
+	--start		Start time of metrics collected with format "yyyy-MM-ddTHH:mm:ss+/-HH:mm" or "yyyy-MM-ddTHH:mm:ssZ", default to very beginning if not specified.
+	--end		End time of the metrics collected with format "yyyy-MM-ddTHH:mm:ss+/-HH:mm" or "yyyy-MM-ddTHH:mm:ssZ", default to current time if not speficied.
+	--number	The number of the records to return, will be ignored if both start time and end time are specified.
+	--desc		Display in descending order, default to ascending order if not specified.
+	--output	Dump the metrics to a file in table format.
 					`,
 				},
 			},
@@ -83,11 +84,12 @@ OPTIONS:
 				Alias:    "ash",
 				HelpText: "Retrieve the scaling history of an application",
 				UsageDetails: plugin.Usage{
-					Usage: `cf autoscaling-history APP_NAME [--start START_TIME] [--end END_TIME] [--desc] [--output PATH_TO_FILE]
+					Usage: `cf autoscaling-history APP_NAME [--start START_TIME] [--end END_TIME] [--number NUMBER] [--desc] [--output PATH_TO_FILE] 
 
 OPTIONS:
 	--start		Start time of the scaling history with format "yyyy-MM-ddTHH:mm:ss+/-HH:mm" or "yyyy-MM-ddTHH:mm:ssZ", default to very beginning if not specified.
 	--end		End time of the scaling history with format "yyyy-MM-ddTHH:mm:ss+/-HH:mm" or "yyyy-MM-ddTHH:mm:ssZ", default to current time if not speficied.
+	--number	The number of the records to return, will be ignored if both start time and end time are specified.
 	--desc		Display in descending order, default to ascending order if not specified.
 	--output	Dump the scaling history to a file in table format.
 					`,