Merge pull request #241 from prateekpandey14/cherry-pic-from-master

Cherry-pic from master PR #230

cmd/mayactl/app/command/snapshot/create.go

@@ -94,7 +94,7 @@ func (c *CmdSnaphotCreateOptions) RunSnapshotCreate(cmd *cobra.Command) error {
 
  resp := mapiserver.CreateSnapshot(c.volName, c.snapName)
  if resp != nil {
- return errors.New(fmt.Sprintf("Error: %v", resp))
+ return fmt.Errorf("Snapshot create failed: %v", resp)
  }
 
  fmt.Printf("Volume snapshot Successfully Created:%v\n", c.volName)

cmd/mayactl/app/command/snapshot/list.go

@@ -45,24 +45,21 @@ func NewCmdSnapshotList() *cobra.Command {
  return cmd
 }
 
-// Validate validates the flag values
+// ValidateList validates the flag values
 func (c *CmdSnaphotCreateOptions) ValidateList(cmd *cobra.Command) error {
  if c.volName == "" {
  return errors.New("--volname is missing. Please specify an unique name")
  }
  return nil
 }
 
-// RunSnapshotCreate does tasks related to mayaserver.
+// RunSnapshotList does tasks related to mayaserver.
 func (c *CmdSnaphotCreateOptions) RunSnapshotList(cmd *cobra.Command) error {
  fmt.Println("Executing volume snapshot list...")
 
  resp := mapiserver.ListSnapshot(c.volName)
  if resp != nil {
- return errors.New(fmt.Sprintf("Error: %v", resp))
+ return fmt.Errorf("Error list available snapshot: %v", resp)
  }
-
- fmt.Printf("Volume snapshots are:%v\n", resp)
-
  return nil
 }

cmd/mayactl/app/command/snapshot/revert.go

@@ -44,12 +44,12 @@ func NewCmdSnapshotRevert() *cobra.Command {
  },
  }
 
- cmd.Flags().StringVarP(&options.volName, "volname", "", options.volName,
+ cmd.Flags().StringVarP(&options.volName, "volname", "n", options.volName,
  "unique volume name.")
  cmd.MarkPersistentFlagRequired("volname")
  cmd.MarkPersistentFlagRequired("snapname")
 
- cmd.Flags().StringVarP(&options.snapName, "snapname", "", options.snapName,
+ cmd.Flags().StringVarP(&options.snapName, "snapname", "s", options.snapName,
  "unique snapshot name")
 
  return cmd

pkg/client/jiva/controller_client.go

@@ -101,6 +101,7 @@ func GetVolume(path string) (*Volumes, error) {
 
  return &volume.Data[0], nil
 }
+
 func (c *ControllerClient) Get(path string, obj interface{}) error {
  resp, err := http.Get(path)
 
@@ -112,6 +113,9 @@ func (c *ControllerClient) Get(path string, obj interface{}) error {
  return json.NewDecoder(resp.Body).Decode(obj)
 }
 
+// ListReplicas to get the details of all the existing replicas
+// which contains address and mode of those replicas (RW/R/W) as well as
+// resource information.
 func (c *ControllerClient) ListReplicas(path string) ([]Replica, error) {
  var resp ReplicaCollection
 

pkg/client/mapiserver/snapshot.go

@@ -22,9 +22,11 @@ import (
  "fmt"
  "io/ioutil"
  "net/http"
+ "strings"
  "time"
 
  client "github.com/openebs/maya/pkg/client/jiva"
+ "github.com/openebs/maya/pkg/util"
  "github.com/openebs/maya/types/v1"
  yaml "gopkg.in/yaml.v2"
 )
@@ -52,8 +54,6 @@ func CreateSnapshot(volName string, snapName string) error {
  //Marshal serializes the value provided into a YAML document
  yamlValue, _ := yaml.Marshal(snap)
 
- fmt.Printf("Volume snapshot spec created:\n%v\n", string(yamlValue))
-
  url := GetURL() + "/latest/snapshots/create/"
  req, err := http.NewRequest("POST", url, bytes.NewBuffer(yamlValue))
  if err != nil {
@@ -71,16 +71,18 @@ func CreateSnapshot(volName string, snapName string) error {
  }
  defer resp.Body.Close()
 
- _, err = ioutil.ReadAll(resp.Body)
+ body, err := ioutil.ReadAll(resp.Body)
  if err != nil {
  return err
  }
- fmt.Println(resp)
+
  code := resp.StatusCode
+ if err == nil && code != http.StatusOK {
+ return fmt.Errorf(string(body))
+ }
 
  if code != http.StatusOK {
- err := errors.New(fmt.Sprintf("Status error: %v", http.StatusText(code)))
- return err
+ return fmt.Errorf("Server status error: %v", http.StatusText(code))
  }
  return nil
 }
@@ -128,8 +130,7 @@ func RevertSnapshot(volName string, snapName string) error {
  code := resp.StatusCode
 
  if code != http.StatusOK {
- err := errors.New(fmt.Sprintf("Status error: %v", http.StatusText(code)))
- return err
+ return fmt.Errorf("Server status error: %v", http.StatusText(code))
  }
  return nil
 }
@@ -164,42 +165,35 @@ func ListSnapshot(volName string) error {
  }
  code := resp.StatusCode
  if code != http.StatusOK {
- return fmt.Errorf("Status error: %v", http.StatusText(code))
+ return fmt.Errorf("Server status error: %v", http.StatusText(code))
  }
  snapdisk, err := getInfo([]byte(body))
  if err != nil {
- fmt.Println("Failed to get the snapshot data", err)
+ fmt.Println("Failed to get the snapshot info", err)
  }
- /*out := make([]string, len(snapdisk)+1)
+ out := make([]string, len(snapdisk)+1)
 
  out[0] = "Name|Created At|Size"
  var i int
 
  for _, disk := range snapdisk {
- // if !IsHeadDisk(disk.Name) {
+ // if !util.IsHeadDisk(disk.Name) {
  out[i+1] = fmt.Sprintf("%s|%s|%s",
  strings.TrimSuffix(strings.TrimPrefix(disk.Name, "volume-snap-"), ".img"),
  disk.Created,
  disk.Size)
  i = i + 1
- // }
- }*/
-
- // fmt.Println(util.FormatList(out))
- fmt.Println(snapdisk)
-
+ }
+ fmt.Println(util.FormatList(out))
  return nil
 }
 
-func getInfo(body []byte) (*map[string]client.DiskInfo, error) {
+func getInfo(body []byte) (map[string]client.DiskInfo, error) {
 
- var s = new(map[string]client.DiskInfo)
+ var s = make(map[string]client.DiskInfo)
  err := json.Unmarshal(body, &s)
  if err != nil {
- fmt.Println("Unmarshling Error:", err)
  return nil, err
  }
-
  return s, err
-
 }