Skip to content

Commit 21ff2d6

Browse files
author
Power Cloud Robot
authored
Merge pull request ppc64le-cloud#589 from varad-ahirwadkar/rename_service_instance
Renaming instance-id and instance-name
2 parents 3b388b0 + a1a8e5f commit 21ff2d6

File tree

30 files changed

+144
-109
lines changed

30 files changed

+144
-109
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The typical image workflow comprises of the following steps:
3636
- How to convert RHEL qcow2 to ova image format - [guide](docs/RHEL%20Qcow2%20to%20OVA.md)
3737
- How to convert RHCOS(Red Hat CoreOS) qcow2 to ova image format - [guide](docs/RHCOS%20Qcow2%20to%20OVA.md)
3838
- Advanced scenarios for Qcow2 to ova image conversion - [guide](docs/Advanced%20Scenarios%20for%20Qcow2%20to%20OVA.md)
39-
- How to import image to PowerVS instance from COS - [guide](docs/How%20to%20Import%20Image%20to%20PowerVS%20Instance.md)
39+
- How to import image to PowerVS workspace from COS - [guide](docs/How%20to%20Import%20Image%20to%20PowerVS%20Instance.md)
4040
- How to upload image to COS bucket using pvsadm - [guide](docs/How%20to%20Upload%20Image%20to%20COS.md)
4141
- How to build DHCP supported centos image - [guide](docs/Build%20DHCP%20enabled%20Centos%20Images.md)
4242

‎cmd/create/create.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var Cmd = &cobra.Command{
3030

3131
func init() {
3232
Cmd.AddCommand(port.Cmd)
33-
Cmd.PersistentFlags().StringVarP(&pkg.Options.InstanceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
34-
_ = Cmd.MarkPersistentFlagRequired("instance-id")
33+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
34+
Cmd.PersistentFlags().MarkDeprecated("instance-id", "instance-id is deprecated, workspace-id should be used")
35+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "workspace-id", "", "", "Workspace ID of the PowerVS workspace")
3536
}

‎cmd/create/port/port.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ var Cmd = &cobra.Command{
3535
Use: "port",
3636
Short: "Create PowerVS network port",
3737
Long: `Create PowerVS network port`,
38+
PreRunE: func(cmd *cobra.Command, args []string) error {
39+
if pkg.Options.WorkspaceID == "" {
40+
return fmt.Errorf("--workspace-id required")
41+
}
42+
return nil
43+
},
3844
RunE: func(cmd *cobra.Command, args []string) error {
3945
opt := pkg.Options
4046

@@ -44,7 +50,7 @@ var Cmd = &cobra.Command{
4450
return err
4551
}
4652

47-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
53+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
4854
if err != nil {
4955
return err
5056
}

‎cmd/delete/delete.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ var Cmd = &cobra.Command{
3030

3131
func init() {
3232
Cmd.AddCommand(port.Cmd)
33-
Cmd.PersistentFlags().StringVarP(&pkg.Options.InstanceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
34-
_ = Cmd.MarkPersistentFlagRequired("instance-id")
33+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
34+
Cmd.PersistentFlags().MarkDeprecated("instance-id", "instance-id is deprecated, workspace-id should be used")
35+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "workspace-id", "", "", "Workspace ID of the PowerVS instance")
3536
}

‎cmd/delete/port/port.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ var Cmd = &cobra.Command{
3434
Use: "port",
3535
Short: "Delete PowerVS network port",
3636
Long: `Delete PowerVS network port`,
37+
PreRunE: func(cmd *cobra.Command, args []string) error {
38+
if pkg.Options.WorkspaceID == "" {
39+
return fmt.Errorf("--workspace-id required")
40+
}
41+
return nil
42+
},
3743
RunE: func(cmd *cobra.Command, args []string) error {
3844
opt := pkg.Options
3945

@@ -43,7 +49,7 @@ var Cmd = &cobra.Command{
4349
return err
4450
}
4551

46-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
52+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
4753
if err != nil {
4854
return err
4955
}

‎cmd/dhcp-sync/dhcp-sync.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func syncDHCPD() {
8787
klog.Fatalf("failed to create a session with IBM cloud: %v", err)
8888
}
8989

90-
pvmclient, err := client.NewPVMClientWithEnv(c, pkg.Options.InstanceID, "", "prod")
90+
pvmclient, err := client.NewPVMClientWithEnv(c, pkg.Options.WorkspaceID, "", "prod")
9191
if err != nil {
9292
klog.Fatalf("failed to create a PVM client: %v", err)
9393
}
@@ -159,8 +159,8 @@ var Cmd = &cobra.Command{
159159
Long: `dhcp-sync tool is a tool populating the dhcpd.conf file from the PowerVS network and restart the dhcpd service.`,
160160
GroupID: "dhcp",
161161
PreRunE: func(cmd *cobra.Command, args []string) error {
162-
if pkg.Options.InstanceID == "" {
163-
return fmt.Errorf("--instance-id is required")
162+
if pkg.Options.WorkspaceID == "" {
163+
return fmt.Errorf("--workspace-id is required")
164164
}
165165
if pkg.Options.APIKey == "" {
166166
return fmt.Errorf("api-key can't be empty, pass the token via --api-key or set IBMCLOUD_API_KEY environment variable")
@@ -211,7 +211,9 @@ var Cmd = &cobra.Command{
211211
}
212212

213213
func init() {
214-
Cmd.Flags().StringVarP(&pkg.Options.InstanceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
214+
Cmd.Flags().StringVarP(&pkg.Options.WorkspaceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
215+
Cmd.Flags().MarkDeprecated("instance-id", "instance-id is deprecated, workspace-id should be used")
216+
Cmd.Flags().StringVarP(&pkg.Options.WorkspaceID, "workspace-id", "w", "", "Workspace ID of the PowerVS instance")
215217
Cmd.Flags().StringVar(&networkID, "network-id", "", "Network ID to be monitored")
216218
Cmd.Flags().StringVar(&file, "file", "/etc/dhcp/dhcpd.conf", "DHCP conf file")
217219
Cmd.Flags().StringVar(&gateway, "gateway", "", "Override the gateway value with")

‎cmd/dhcpserver/cmd.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ var Cmd = &cobra.Command{
3030
if pkg.Options.APIKey == "" {
3131
return fmt.Errorf("api-key can't be empty, pass the token via --api-key or set IBMCLOUD_API_KEY environment variable")
3232
}
33+
if pkg.Options.WorkspaceID == "" {
34+
return fmt.Errorf("--workspace-id required")
35+
}
3336
return nil
3437
},
3538
RunE: func(cmd *cobra.Command, args []string) error {
@@ -43,6 +46,7 @@ func init() {
4346
Cmd.AddCommand(getCmd)
4447
Cmd.AddCommand(deleteCmd)
4548

46-
Cmd.PersistentFlags().StringVarP(&pkg.Options.InstanceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
47-
_ = Cmd.MarkPersistentFlagRequired("instance-id")
49+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
50+
Cmd.PersistentFlags().MarkDeprecated("instance-id", "instance-id is deprecated, workspace-id should be used")
51+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "workspace-id", "", "", "Workspace ID of the PowerVS instance")
4852
}

‎cmd/dhcpserver/create.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var createCmd = &cobra.Command{
4545
return err
4646
}
4747

48-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
48+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
4949
if err != nil {
5050
return err
5151
}

‎cmd/dhcpserver/delete.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var deleteCmd = &cobra.Command{
3838
return err
3939
}
4040

41-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
41+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
4242
if err != nil {
4343
return err
4444
}

‎cmd/dhcpserver/get.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var getCmd = &cobra.Command{
4242
return err
4343
}
4444

45-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
45+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
4646
if err != nil {
4747
return err
4848
}

‎cmd/dhcpserver/list.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var listCmd = &cobra.Command{
3838
return err
3939
}
4040

41-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
41+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
4242
if err != nil {
4343
return err
4444
}

‎cmd/get/events/events.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ var Cmd = &cobra.Command{
3535
Short: "Get Powervs events",
3636
Long: `Get the PowerVS events`,
3737
PreRunE: func(cmd *cobra.Command, args []string) error {
38-
if pkg.Options.InstanceID == "" && pkg.Options.InstanceName == "" {
39-
return fmt.Errorf("--instance-id or --instance-name required")
38+
if pkg.Options.WorkspaceID == "" && pkg.Options.WorkspaceName == "" {
39+
return fmt.Errorf("--workspace-id or --workspace-name required")
4040
}
4141
return nil
4242
},
@@ -49,7 +49,7 @@ var Cmd = &cobra.Command{
4949
return err
5050
}
5151

52-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
52+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
5353
if err != nil {
5454
return err
5555
}

‎cmd/get/get.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ func init() {
3636
Cmd.AddCommand(events.Cmd)
3737
Cmd.AddCommand(peravailability.Cmd)
3838
Cmd.AddCommand(ports.Cmd)
39-
Cmd.PersistentFlags().StringVarP(&pkg.Options.InstanceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
40-
Cmd.PersistentFlags().StringVarP(&pkg.Options.InstanceName, "instance-name", "n", "", "Instance name of the PowerVS")
39+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "instance-id", "i", "", "Instance ID of the PowerVS instance")
40+
Cmd.PersistentFlags().MarkDeprecated("instance-id", "instance-id is deprecated, workspace-id should be used")
41+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceName, "instance-name", "n", "", "Instance name of the PowerVS")
42+
Cmd.PersistentFlags().MarkDeprecated("instance-name", "instance-name is deprecated, workspace-name should be used")
43+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceID, "workspace-id", "", "", "Workspace ID of the PowerVS instance")
44+
Cmd.PersistentFlags().StringVarP(&pkg.Options.WorkspaceName, "workspace-name", "", "", "Workspace name of the PowerVS")
4145
}

‎cmd/get/peravailability/peravailability.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ var Cmd = &cobra.Command{
3232
Short: "List regions that support PER",
3333
Long: "List regions that support Power Edge Router (PER)",
3434
PreRunE: func(cmd *cobra.Command, args []string) error {
35-
if pkg.Options.InstanceID == "" && pkg.Options.InstanceName == "" {
36-
return fmt.Errorf("--instance-id or --instance-name required")
35+
if pkg.Options.WorkspaceID == "" && pkg.Options.WorkspaceName == "" {
36+
return fmt.Errorf("--workspace-id or --workspace-name required")
3737
}
3838
return nil
3939
},
@@ -46,7 +46,7 @@ var Cmd = &cobra.Command{
4646
return err
4747
}
4848

49-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
49+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
5050
if err != nil {
5151
return err
5252
}
@@ -64,9 +64,9 @@ var Cmd = &cobra.Command{
6464
}
6565
}
6666
if !supportsPER {
67-
klog.Infof("%s, where the current instance is present does not support PER.", pvmclient.Zone)
67+
klog.Infof("%s, where the current workspace is present does not support PER.", pvmclient.Zone)
6868
} else {
69-
klog.Infof("%s, where the current instance is present supports PER.", pvmclient.Zone)
69+
klog.Infof("%s, where the current workspace is present supports PER.", pvmclient.Zone)
7070
}
7171
sort.Strings(perEnabledRegions)
7272
klog.Infof("The following zones/datacenters have support for PER:%v.More information at https://cloud.ibm.com/docs/overview?topic=overview-locations", perEnabledRegions)

‎cmd/get/ports/ports.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ var Cmd = &cobra.Command{
3535
Short: "Get PowerVS network ports",
3636
Long: `Get PowerVS network ports`,
3737
PreRunE: func(cmd *cobra.Command, args []string) error {
38-
if pkg.Options.InstanceID == "" && pkg.Options.InstanceName == "" {
39-
return fmt.Errorf("--instance-id or --instance-name required")
38+
if pkg.Options.WorkspaceID == "" && pkg.Options.WorkspaceName == "" {
39+
return fmt.Errorf("--workspace-id or --workspace-name required")
4040
}
4141
return nil
4242
},
@@ -49,7 +49,7 @@ var Cmd = &cobra.Command{
4949
return err
5050
}
5151

52-
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment)
52+
pvmclient, err := client.NewPVMClientWithEnv(c, opt.WorkspaceID, opt.WorkspaceName, opt.Environment)
5353
if err != nil {
5454
return err
5555
}

‎cmd/image/import/import.go

+13-8
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ func findCOSInstanceDetails(resources []models.ServiceInstanceV2, bxCli *client.
6464

6565
var Cmd = &cobra.Command{
6666
Use: "import",
67-
Short: "Import the image into PowerVS instances",
68-
Long: `Import the image into PowerVS instances
67+
Short: "Import the image into PowerVS workpace",
68+
Long: `Import the image into PowerVS workpace
6969
pvsadm image import --help for information
7070
7171
# Set the API key or feed the --api-key commandline argument
@@ -90,11 +90,11 @@ pvsadm image import -n upstream-core-lon04 -b <BUCKETNAME> --pvs-storagetype <ST
9090
pvsadm image import -n upstream-core-lon04 -b <BUCKETNAME> --object rhel-83-10032020.ova.gz --pvs-image-name test-image -r <REGION>
9191
9292
# import image from a public IBM Cloud Storage bucket
93-
pvsadm image import -n upstream-core-lon04 -b <BUCKETNAME> --object rhel-83-10032020.ova.gz --pvs-image-name test-image -r <REGION> --public-bucket
93+
pvsadm image import -n upstream-core-lon04 -b <BUCKETNAME> --object rhel-83-10032020.ova.gz --pvs-image-name test-image -r <REGION> --public-bucket
9494
`,
9595
PreRunE: func(cmd *cobra.Command, args []string) error {
96-
if pkg.ImageCMDOptions.InstanceID == "" && pkg.ImageCMDOptions.InstanceName == "" {
97-
return fmt.Errorf("--pvs-instance-name or --pvs-instance-id required")
96+
if pkg.ImageCMDOptions.WorkspaceID == "" && pkg.ImageCMDOptions.WorkspaceName == "" {
97+
return fmt.Errorf("--workspace-name or --workspace-id required")
9898
}
9999

100100
case1 := pkg.ImageCMDOptions.AccessKey == "" && pkg.ImageCMDOptions.SecretKey != ""
@@ -174,7 +174,7 @@ pvsadm image import -n upstream-core-lon04 -b <BUCKETNAME> --object rhel-83-100
174174
opt.SecretKey = cred["secret_access_key"].(string)
175175
}
176176

177-
pvmclient, err := client.NewPVMClientWithEnv(bxCli, opt.InstanceID, opt.InstanceName, pkg.Options.Environment)
177+
pvmclient, err := client.NewPVMClientWithEnv(bxCli, opt.WorkspaceID, opt.WorkspaceName, pkg.Options.Environment)
178178
if err != nil {
179179
return err
180180
}
@@ -242,8 +242,13 @@ pvsadm image import -n upstream-core-lon04 -b <BUCKETNAME> --object rhel-83-100
242242
}
243243

244244
func init() {
245-
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.InstanceName, "pvs-instance-name", "n", "", "PowerVS Instance name.")
246-
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.InstanceID, "pvs-instance-id", "i", "", "PowerVS Instance ID.")
245+
// TODO pvs-instance-name and pvs-instance-id is deprecated and will be removed in a future release
246+
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.WorkspaceName, "pvs-instance-name", "n", "", "PowerVS Instance name.")
247+
Cmd.Flags().MarkDeprecated("pvs-instance-name", "pvs-instance-name is deprecated, workspace-name should be used")
248+
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.WorkspaceID, "pvs-instance-id", "i", "", "PowerVS Instance ID.")
249+
Cmd.Flags().MarkDeprecated("pvs-instance-id", "pvs-instance-id is deprecated, workspace-id should be used")
250+
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.WorkspaceName, "workspace-name", "", "", "PowerVS Workspace name.")
251+
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.WorkspaceID, "workspace-id", "", "", "PowerVS Workspace ID.")
247252
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.BucketName, "bucket", "b", "", "Cloud Object Storage bucket name.")
248253
Cmd.Flags().StringVarP(&pkg.ImageCMDOptions.COSInstanceName, "cos-instance-name", "s", "", "Cloud Object Storage instance name.")
249254
// TODO It's deprecated and will be removed in a future release

‎cmd/image/sync/mock/sync_client_generated.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)