-
Notifications
You must be signed in to change notification settings - Fork 41
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support to list PER enabled DCs/Zones #542
Merged
ppc64le-cloud-bot
merged 1 commit into
ppc64le-cloud:main
from
kishen-v:per-availability
Jan 12, 2024
+145
−18
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
// Copyright 2021 IBM Corp | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package peravailability | ||
|
||
import ( | ||
"fmt" | ||
"sort" | ||
|
||
"github.com/spf13/cobra" | ||
"k8s.io/klog/v2" | ||
|
||
"github.com/ppc64le-cloud/pvsadm/pkg" | ||
"github.com/ppc64le-cloud/pvsadm/pkg/client" | ||
) | ||
|
||
const powerEdgeRouter = "power-edge-router" | ||
|
||
var Cmd = &cobra.Command{ | ||
Use: "per-availability", | ||
Short: "List regions that support PER", | ||
Long: "List regions that support Power Edge Router (PER)", | ||
PreRunE: func(cmd *cobra.Command, args []string) error { | ||
if pkg.Options.InstanceID == "" && pkg.Options.InstanceName == "" { | ||
return fmt.Errorf("--instance-id or --instance-name required") | ||
} | ||
return nil | ||
}, | ||
RunE: func(cmd *cobra.Command, args []string) error { | ||
var perEnabledRegions = []string{} | ||
opt := pkg.Options | ||
c, err := client.NewClientWithEnv(opt.APIKey, opt.Environment, opt.Debug) | ||
if err != nil { | ||
klog.Errorf("failed to create a session with IBM cloud: %v", err) | ||
return err | ||
} | ||
|
||
pvmclient, err := client.NewPVMClientWithEnv(c, opt.InstanceID, opt.InstanceName, opt.Environment) | ||
if err != nil { | ||
return err | ||
} | ||
ret, err := pvmclient.DatacenterClient.GetAll() | ||
if err != nil { | ||
return err | ||
} | ||
supportsPER := false | ||
for _, datacenter := range ret.Datacenters { | ||
if datacenter.Capabilities[powerEdgeRouter] { | ||
perEnabledRegions = append(perEnabledRegions, *datacenter.Location.Region) | ||
if pvmclient.Zone == *datacenter.Location.Region { | ||
supportsPER = true | ||
} | ||
} | ||
} | ||
if !supportsPER { | ||
klog.Infof("%s, where the current instance is present does not support PER.", pvmclient.Zone) | ||
} else { | ||
klog.Infof("%s, where the current instance is present supports PER.", pvmclient.Zone) | ||
} | ||
sort.Strings(perEnabledRegions) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason behind the sorting? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just for improved readability, where datacenters of the same region stay grouped. 🙂
|
||
klog.Infoln("The following zones/datacenters have support for PER:", perEnabledRegions, ".", "More information at https://cloud.ibm.com/docs/overview?topic=overview-locations") | ||
return nil | ||
}, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
// Copyright 2021 IBM Corp | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package datacenter | ||
|
||
import ( | ||
"context" | ||
|
||
"github.com/IBM-Cloud/power-go-client/clients/instance" | ||
"github.com/IBM-Cloud/power-go-client/ibmpisession" | ||
"github.com/IBM-Cloud/power-go-client/power/models" | ||
) | ||
|
||
type Client struct { | ||
client *instance.IBMPIDatacentersClient | ||
instanceID string | ||
} | ||
|
||
func NewClient(sess *ibmpisession.IBMPISession, powerinstanceid string) *Client { | ||
c := &Client{ | ||
instanceID: powerinstanceid, | ||
} | ||
c.client = instance.NewIBMPIDatacenterClient(context.Background(), sess, powerinstanceid) | ||
return c | ||
} | ||
|
||
func (c *Client) Get(id string) (*models.Datacenter, error) { | ||
return c.client.Get(id) | ||
} | ||
|
||
func (c *Client) GetAll() (*models.Datacenters, error) { | ||
return c.client.GetAll() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of checking here, once
perEnabledRegions
is populated, you can check outside the for loop only once.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The current design will avoid an additional round of iteration on
perEnabledRegions
as the membership is validated within the same loop. Hope this is ok.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes understood, I think the current code looks good to me!