Merge pull request #159 from lpabon/bugs156

Fix help ui screens

Author: lpabon

handler/cluster/alerts/alerts.go

@@ -31,7 +31,7 @@ var _ = commander.RegisterCommandVar(func() {
 		Aliases: []string{"alerts"},
 		Short:   "Manage alerts on a Portworx cluster",
 		Run: func(cmd *cobra.Command, args []string) {
-			util.Printf("Please see pxc alert --help for more commands\n")
+			util.Printf("Please see pxc cluster alert --help for more commands\n")
 		},
 	}
 })

handler/plugin/list.go

@@ -88,7 +88,6 @@ func ListAddCommand(cmd *cobra.Command) {
 }
 
 func listExec(cmd *cobra.Command, args []string) error {
-	logrus.Info("In listExec")
 	listOptions.Complete(cmd)
 	return listOptions.Run(cmd, args)
 }
@@ -114,7 +113,7 @@ func (o *pluginListOptions) Run(cmd *cobra.Command, args []string) error {
 		files, err := ioutil.ReadDir(dir)
 		if err != nil {
 			if _, ok := err.(*os.PathError); ok {
-				util.Eprintf("Unable read directory %q from your PATH: %v. Skipping...", dir, err)
+				logrus.Warnf("Unable read directory %q from your PATH: %v. Skipping...", dir, err)
 				continue
 			}
 

handler/test/common.go

@@ -252,7 +252,7 @@ func PxTestCreateAggrVolume(t *testing.T, volName string, size uint64, aggrLevel
 
 // Helper function to create volume with "io profile" flag set
 func PxTestCreateIoProfVolume(t *testing.T, volName string, size uint64, IoProfile string) {
-	cli := fmt.Sprintf("pxc volume create %s --size %d --ioprofile %s",
+	cli := fmt.Sprintf("pxc volume create %s --size %d --io-profile %s",
 		volName, size, IoProfile)
 	lines, _, err := ExecuteCli(cli)
 	assert.NoError(t, err)
@@ -261,13 +261,13 @@ func PxTestCreateIoProfVolume(t *testing.T, volName string, size uint64, IoProfi
 }
 
 func PxTestPatchVolumeHalevel(t *testing.T, volName string, haLevel int) {
-	cli := fmt.Sprintf("pxc volume update %s --halevel %d", volName, haLevel)
+	cli := fmt.Sprintf("pxc volume update %s --replicas %d", volName, haLevel)
 	lines, _, _ := ExecuteCli(cli)
 	assert.Equal(t, "Volume "+volName+" parameter updated successfully", lines[0])
 }
 
 func PxTestPatchVolumeHalevelWithNodes(t *testing.T, volName string, haLevel int64, node string) {
-	cli := fmt.Sprintf("pxc volume update %s --halevel %d --node %s", volName, haLevel, node)
+	cli := fmt.Sprintf("pxc volume update %s --replicas %d --node %s", volName, haLevel, node)
 	lines, _, _ := ExecuteCli(cli)
 	assert.Equal(t, "Volume "+volName+" parameter updated successfully", lines)
 }

handler/volume/create.go

@@ -104,17 +104,17 @@ var _ = commander.RegisterCommandInit(func() {
 	createVolumeCmd.Flags().BoolVar(&cvOpts.req.Spec.Sticky, "sticky", false, "Sticky volume")
 	createVolumeCmd.Flags().BoolVar(&cvOpts.req.Spec.Journal, "journal", false, "Journal data for this volume")
 	createVolumeCmd.Flags().BoolVar(&cvOpts.req.Spec.Encrypted, "encryption", false, "encrypt this volume")
-	createVolumeCmd.Flags().Uint32Var(&cvOpts.req.Spec.AggregationLevel, "aggregation-level", 0, "aggregation level (Valid Values: [1, 2, 3] (default 1)")
+	createVolumeCmd.Flags().Uint32Var(&cvOpts.req.Spec.AggregationLevel, "aggregation-level", 1, "aggregation level (Valid Values: [1, 2, 3]")
 	createVolumeCmd.Flags().StringSliceVar(&cvOpts.replicaSet, "nodes", []string{}, "Replica set nodes for this volume")
-	createVolumeCmd.Flags().StringVar(&cvOpts.IoProfile, "ioprofile", "", "IO Profile (Valid Values: [sequential cms db db_remote sync_shared]) (default sequential)")
+	createVolumeCmd.Flags().StringVar(&cvOpts.IoProfile, "io-profile", "sequential", "IO Profile (Valid Values: [sequential cms db db_remote sync_shared])")
 	createVolumeCmd.Flags().StringVar(&cvOpts.groups, "groups", "", "list of group with volume access details, 'group1:r, group2:w'")
 	createVolumeCmd.Flags().StringVar(&cvOpts.collaborators, "collaborators", "", "list of collaborators with volume access details, 'user1:r, user2:w'")
-	createVolumeCmd.Flags().Uint32Var(&cvOpts.req.Spec.QueueDepth, "queue-depth", 128, "block device queue depth (Valid Range: [1 256]) (default 128)")
+	createVolumeCmd.Flags().Uint32Var(&cvOpts.req.Spec.QueueDepth, "queue-depth", 128, "block device queue depth (Valid Range: [1 256])")
 	createVolumeCmd.Flags().BoolVar(&cvOpts.earlyAck, "early-ack", false, "Reply to async write requests after it is copied to shared memory")
 	createVolumeCmd.Flags().BoolVar(&cvOpts.asyncIo, "async-io", false, "Enable async IO to backing storage")
 	createVolumeCmd.Flags().BoolVar(&cvOpts.req.Spec.Nodiscard, "nodiscard", false, "Disable discard support for this volume")
 	createVolumeCmd.Flags().BoolVar(&cvOpts.req.Spec.GroupEnforced, "group-enforced", false, "Enforce group during provision")
-	createVolumeCmd.Flags().Uint32Var(&cvOpts.req.Spec.Scale, "scale", 0, "auto scale to max number (Valid Range: [1 1024]) (default 1)")
+	createVolumeCmd.Flags().Uint32Var(&cvOpts.req.Spec.Scale, "scale", 1, "auto scale to max number (Valid Range: [1 1024])")
 	createVolumeCmd.Flags().StringVar(&cvOpts.passPhrase, "passphrase", "", "Passphrase for an encrypted volume")
 	createVolumeCmd.Flags().StringVar(&cvOpts.periodic, "periodic", "", "periodic snapshot interval in mins,k (keeps 5 by default), 0 disables all schedule snapshots")
 	createVolumeCmd.Flags().StringSliceVar(&cvOpts.daily, "daily", []string{}, "daily snapshot at specified hh:mm,k (keeps 7 by default)")
@@ -202,6 +202,8 @@ func createVolumeExec(c *cobra.Command, args []string) error {
 			cvOpts.req.Spec.IoProfile = api.IoProfile_IO_PROFILE_DB_REMOTE
 		case "sync_shared":
 			cvOpts.req.Spec.IoProfile = api.IoProfile_IO_PROFILE_SYNC_SHARED
+		case "sequential":
+			cvOpts.req.Spec.IoProfile = api.IoProfile_IO_PROFILE_SEQUENTIAL
 		default:
 			flagError := errors.New("Invalid IO profile")
 			return flagError

handler/volume/patch.go

@@ -95,7 +95,7 @@ var _ = commander.RegisterCommandVar(func() {
 var _ = commander.RegisterCommandInit(func() {
 	VolumeAddCommand(patchVolumeCmd)
 
-	patchVolumeCmd.Flags().Int64Var(&updateReq.halevel, "halevel", 0, "New replication factor (Valid Range: [1, 3]) (default 1)")
+	patchVolumeCmd.Flags().Int64Var(&updateReq.halevel, "replicas", 0, "New replication factor (Valid Range: [1, 3]) (default 1)")
 	patchVolumeCmd.Flags().StringSliceVar(&updateReq.replicaSet, "nodes", []string{}, "Desired set of nodes for the volume data")
 	patchVolumeCmd.Flags().Uint64Var(&updateReq.size, "size", 0, "New size for the volume (GiB) (default 1)")
 	patchVolumeCmd.Flags().StringVar(&updateReq.shared, "shared", "", "set shared setting (Valid Values: [on off]) (default \"off\")")