diff --git a/cmd/openshift-tests/provider.go b/cmd/openshift-tests/provider.go index 4a23d7e177d8..b2c25982e012 100644 --- a/cmd/openshift-tests/provider.go +++ b/cmd/openshift-tests/provider.go @@ -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 { diff --git a/cmd/openshift-tests/provider_test.go b/cmd/openshift-tests/provider_test.go index 2c558449f26e..6e795673c669 100644 --- a/cmd/openshift-tests/provider_test.go +++ b/cmd/openshift-tests/provider_test.go @@ -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, } @@ -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"}`, diff --git a/test/extended/util/alibabacloud/provider.go b/test/extended/util/alibabacloud/provider.go new file mode 100644 index 000000000000..c76112201cd6 --- /dev/null +++ b/test/extended/util/alibabacloud/provider.go @@ -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 +}