#816 added Encrypted to block volume-detail

Author: allmightyspiff

bin/buildAndDeploy.py

@@ -4,6 +4,7 @@
 import json
 from pathlib import Path
 import os
+import sys
 import re
 import subprocess
 import requests

plugin/commands/block/volume_detail.go

@@ -135,6 +135,11 @@ func (cmd *VolumeDetailCommand) Run(args []string) error {
 		return slErr.NewAPIError(T("Failed to decoded the note.\n"), err.Error(), 2)
 	}
 	table.Add(T("Notes"), decodedValue)
+	hasEncryption := T("false")
+	if (blockVolume.HasEncryptionAtRest != nil) {
+		hasEncryption = T(fmt.Sprintf("%v", *blockVolume.HasEncryptionAtRest))
+	}	
+	table.Add(T("Encrypted"), hasEncryption)
 	table.Print()
 	return nil
 }

plugin/commands/block/volume_detail_test.go

@@ -1,37 +1,33 @@
 package block_test
 
 import (
-	"errors"
-
-	. "github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/matchers"
 	"github.com/IBM-Cloud/ibm-cloud-cli-sdk/testhelpers/terminal"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/softlayer/softlayer-go/datatypes"
 	"github.com/softlayer/softlayer-go/session"
-	"github.com/softlayer/softlayer-go/sl"
 
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/commands/block"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/metadata"
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/testhelpers"
 )
 
-var _ = Describe("Volume detail", func() {
+var _ = Describe("Block Volume-Detail Tests", func() {
 	var (
 		fakeUI             *terminal.FakeUI
-		FakeStorageManager *testhelpers.FakeStorageManager
 		cliCommand         *block.VolumeDetailCommand
-		fakeSession        *session.Session
+		fakeSession *session.Session
+		fakeHandler *testhelpers.FakeTransportHandler
 		slCommand          *metadata.SoftlayerStorageCommand
 	)
 	BeforeEach(func() {
 		fakeUI = terminal.NewFakeUI()
-		FakeStorageManager = new(testhelpers.FakeStorageManager)
+		fakeSession = testhelpers.NewFakeSoftlayerSession(nil)
+		fakeHandler = testhelpers.GetSessionHandler(fakeSession)
 		slCommand = metadata.NewSoftlayerStorageCommand(fakeUI, fakeSession, "block")
 		cliCommand = block.NewVolumeDetailCommand(slCommand)
 		cliCommand.Command.PersistentFlags().Var(cliCommand.OutputFlag, "output", "--output=JSON for json output.")
-		cliCommand.StorageManager = FakeStorageManager
+
 	})
 
 	Describe("Volume detail", func() {
@@ -52,7 +48,7 @@ var _ = Describe("Volume detail", func() {
 
 		Context("Volume detail with correct volume id but server API call fails", func() {
 			BeforeEach(func() {
-				FakeStorageManager.GetVolumeDetailsReturns(datatypes.Network_Storage{}, errors.New("Internal Server Error"))
+				fakeHandler.AddApiError("SoftLayer_Network_Storage", "getObject", 500, "Internal Server Error")
 			})
 			It("return error", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command, "1234")
@@ -63,75 +59,14 @@ var _ = Describe("Volume detail", func() {
 		})
 
 		Context("Volume detail with correct volume id", func() {
-			BeforeEach(func() {
-				FakeStorageManager.GetVolumeDetailsReturns(datatypes.Network_Storage{
-					Id:               sl.Int(1234),
-					Username:         sl.String("myvolume"),
-					CapacityGb:       sl.Int(1000),
-					Iops:             sl.String("400"),
-					StorageTierLevel: sl.String("HEAVY_WRITE"),
-					StorageType: &datatypes.Network_Storage_Type{
-						KeyName: sl.String("performance"),
-					},
-					ServiceResource: &datatypes.Network_Service_Resource{
-						Datacenter: &datatypes.Location{
-							Name: sl.String("tok02"),
-						},
-					},
-					ServiceResourceBackendIpAddress: sl.String("9.9.9.9"),
-					SnapshotCapacityGb:              sl.String("500"),
-					ParentVolume: &datatypes.Network_Storage{
-						SnapshotSizeBytes: sl.String("10000"),
-					},
-					ActiveTransactionCount: sl.Uint(uint(1)),
-					ActiveTransactions: []datatypes.Provisioning_Version1_Transaction{
-						datatypes.Provisioning_Version1_Transaction{
-							TransactionStatus: &datatypes.Provisioning_Version1_Transaction_Status{
-								FriendlyName: sl.String("Restarting"),
-							},
-						},
-					},
-					ReplicationPartnerCount: sl.Uint(uint(1)),
-					ReplicationStatus:       sl.String("replication finished"),
-					ReplicationPartners: []datatypes.Network_Storage{
-						datatypes.Network_Storage{
-							Id:                              sl.Int(5678),
-							Username:                        sl.String("myreplicant"),
-							ServiceResourceBackendIpAddress: sl.String("9.9.9.8"),
-							ServiceResource: &datatypes.Network_Service_Resource{
-								Datacenter: &datatypes.Location{
-									Name: sl.String("dal10"),
-								},
-							},
-							ReplicationSchedule: &datatypes.Network_Storage_Schedule{
-								Type: &datatypes.Network_Storage_Schedule_Type{
-									Keyname: sl.String("DAILY"),
-								},
-							},
-						},
-					},
-				}, nil)
-			})
 			It("return no error", func() {
 				err := testhelpers.RunCobraCommand(cliCommand.Command, "1234")
 				Expect(err).NotTo(HaveOccurred())
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"1234"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"myvolume"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"1000"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"400"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"HEAVY_WRITE"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"tok02"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"performance"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"9.9.9.9"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"500"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"Restarting"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"replication finished"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"5678"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"myreplicant"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"9.9.9.8"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"dal10"}))
-				Expect(fakeUI.Outputs()).To(ContainSubstrings([]string{"DAILY"}))
-
+				Expect(fakeUI.Outputs()).To(ContainSubstring("ID                         17336531"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("User name                  IBM01SEL278444-16"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Endurance Tier             WRITEHEAVY_TIER"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Notes                      -"))
+				Expect(fakeUI.Outputs()).To(ContainSubstring("Encrypted                  false"))
 			})
 		})
 	})

plugin/managers/storage.go

@@ -34,7 +34,7 @@ const (
 	BLOCK_VOLUME_DEFAULT_MASK = "id,username,lunId,capacityGb,bytesUsed,serviceResource.datacenter.name,serviceResourceBackendIpAddress,storageType.keyName,activeTransactionCount,billingItem.orderItem.order[id,userRecord.username],notes,iops," + "activeTransactionCount,replicationPartnerCount"
 	BLOCK_VOLUME_DETAIL_MASK  = "id,username,password,capacityGb,snapshotCapacityGb,parentVolume.snapshotSizeBytes,storageType.keyName," +
 		"serviceResource.datacenter.name,serviceResourceBackendIpAddress,storageTierLevel,iops,lunId," +
-		"originalVolumeName,originalSnapshotName,originalVolumeSize," +
+		"originalVolumeName,originalSnapshotName,originalVolumeSize,hasEncryptionAtRest," +
 		"activeTransactionCount,activeTransactions.transactionStatus.friendlyName," +
 		"replicationPartnerCount,replicationStatus," +
 		"replicationPartners[id,username,serviceResourceBackendIpAddress,serviceResource.datacenter.name,replicationSchedule.type.keyname],notes"