Skip to content

Bug 2045590: Adding new cloud provider e2e for alibabacloud #26786

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.

Sign up for GitHub

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

Closed
openshift-cherrypick-robot wants to merge 1 commit into from
Closed

Bug 2045590: Adding new cloud provider e2e for alibabacloud #26786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/openshift-tests/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func decodeProvider(provider string, dryRun, discover bool, clusterState *exutil
}
fallthrough

case "azure", "aws", "baremetal", "gce", "vsphere":
case "azure", "aws", "baremetal", "gce", "vsphere", "alibabacloud":
if clusterState == nil {
clientConfig, err := e2e.LoadConfig(true)
if err != nil {
Expand Down
16 changes: 16 additions & 0 deletions cmd/openshift-tests/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ var vspherePlatform = &configv1.PlatformStatus{
Type: configv1.VSpherePlatformType,
}

var alibabaPlatform = &configv1.PlatformStatus{
Type: configv1.AlibabaCloudPlatformType,
AlibabaCloud: &configv1.AlibabaCloudPlatformStatus{
Region: "us-east-1",
},
}

var noPlatform = &configv1.PlatformStatus{
Type: configv1.NonePlatformType,
}
Expand Down Expand Up @@ -195,6 +202,15 @@ func TestDecodeProvider(t *testing.T) {
expectedConfig: `{"type":"skeleton","ProjectID":"","Region":"","Zone":"","NumNodes":3,"MultiMaster":true,"MultiZone":false,"Zones":[],"ConfigFile":"","Disconnected":false,"NetworkPlugin":"OpenShiftSDN","HasIPv4":true,"HasIPv6":false,"HasSCTP":false}`,
runTests: sets.NewString("everyone", "not-gce", "not-aws", "not-multitenant", "online", "ipv4"),
},
{
name: "simple AlibabaCloud",
provider: "alibabacloud",
discoveredPlatform: alibabaPlatform,
discoveredMasters: simpleMasters,
discoveredNetwork: sdnConfig,
expectedConfig: `{"type":"skeleton","ProjectID":"","Region":"us-east-1","Zone":"us-east-1a","NumNodes":3,"MultiMaster":true,"MultiZone":true,"Zones":["us-east-1a", "us-east-1b"],"ConfigFile":"","Disconnected":false,"NetworkPlugin":"OpenShiftSDN","HasIPv4":true,"HasIPv6":false,"HasSCTP":false}`,
runTests: sets.NewString("everyone", "not-gce", "not-aws", "not-multitenant", "online", "ipv4"),
},
{
name: "json simple override",
provider: `{"type": "openstack"}`,
Expand Down
18 changes: 18 additions & 0 deletions test/extended/util/alibabacloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package alibabacloud

import (
"k8s.io/kubernetes/test/e2e/framework"
)

func init() {
framework.RegisterProvider("alibabacloud", newProvider)
}

func newProvider() (framework.ProviderInterface, error) {
return &Provider{}, nil
}

// Provider is a structure to handle alibabacloud for e2e testing
type Provider struct {
framework.NullProvider
}