Finish volumes prototype

Signed-off-by: Catherine <[email protected]>
IBM · May 16, 2019 · 78be0b6 · 78be0b6
1 parent 528bcc2
commit 78be0b6
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/web/clui/clui b/web/clui/clui
diff --git a/web/clui/grpcs/attach_volume.go b/web/clui/grpcs/attach_volume.go
@@ -15,10 +15,11 @@ func init() {
 }
 
 func AttachVolume(ctx context.Context, job *model.Job, args []string) (status string, err error) {
-	//|:-COMMAND-:| create_volume.sh 5 7 vdb
+	//|:-COMMAND-:| attach_volume.sh 5 7 vdb
 	db := dbs.DB()
 	argn := len(args)
 	if argn < 4 {
+		db.Model(&model.Volume{}).Updates(map[string]interface{}{"instance_id": 0})
 		err = fmt.Errorf("Wrong params")
 		log.Println("Invalid args", err)
 		return

diff --git a/web/clui/grpcs/clear_vm.go b/web/clui/grpcs/clear_vm.go
@@ -21,7 +21,7 @@ func init() {
 }
 
 func ClearVM(ctx context.Context, job *model.Job, args []string) (status string, err error) {
-	//|:-COMMAND-:| launch_vm.sh '127' 'running' '3'
+	//|:-COMMAND-:| clear_vm.sh '127'
 	db := dbs.DB()
 	argn := len(args)
 	if argn < 2 {

diff --git a/web/clui/routes/volume.go b/web/clui/routes/volume.go
@@ -219,7 +219,6 @@ func (v *VolumeView) Edit(c *macaron.Context, store session.Store) {
 }
 
 func (v *VolumeView) Patch(c *macaron.Context, store session.Store) {
-	log.Println("Enter patch method $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$")
 	redirectTo := "../volumes"
 	id := c.Params(":id")
 	name := c.Query("name")

diff --git a/web/clui/templates/volumes.tmpl b/web/clui/templates/volumes.tmpl
@@ -39,7 +39,7 @@
 			                        <td>{{.Name}}</td>
 			                        <td>{{.Size}}</td>
 			                        <td>{{.Status}}</td>
-			                        <td>{{ if .Instance }} {{.Instance.ID}}-{{.Instance.Hostname}}/{{.Target}} {{ end }}</td>
+			                        <td>{{ if .Instance }} {{.Instance.ID}}-{{.Instance.Hostname}}:{{.Target}} {{ end }}</td>
 			                        <td><a href="{{$Link}}/{{.ID}}"><i class="fa fa-pencil-square-o"></i></a></td>
                                     <td><div class="ui red tiny button delete-button" data-url="{{$Link}}/{{.ID}}" data-id="{{.ID}}">Delete</div></td>
 		                        </tr>