Merge ~jingni.wjj/cloud-init:aliyun_dev into cloud-init:master

[Junjie.Wang]

AliYun: Enable platform identification and enable by default.

AliYun cloud platform is now identifying themselves by setting the dmi product id to the well known value "Alibaba Cloud ECS". The changes here identify that properly in tools/ds-identify and in the DataSourceAliYun.

Since the 'get_data' for AliYun now identifies itself correctly, we
can enable AliYun by default.

LP: #1638931

AliYunDataSource support get platform from bios dmi
Eanble AliYunDataSource by default

[Junjie.Wang (jingni.wjj)]

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:2bb7e229703544aac1ca2d6420cabaf40aa70509
https://jenkins.ubuntu.com/server/job/cloud-init-ci/286/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/286/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/286/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/286/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/286/console
    FAILURE: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/286/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/286/rebuild

review: Needs Fixing (continuous-integration)

[Junjie.Wang (jingni.wjj)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:50339971d263e2c5ea25a84ca3716faf7006cfb5
https://jenkins.ubuntu.com/server/job/cloud-init-ci/287/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/287
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/287
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/287
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/287
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/287

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/287/rebuild

review: Approve (continuous-integration)

[Junjie.Wang (jingni.wjj)]

hi smoser,
I have some change here, and they seem to work fine.
    cloud_platform: get platform from bios,in our cloud platform , an instance vm could use an asm instructions `cpuid` (with eax setted to 0x40000100 ), it will returned our platform id keyword "AliYun" into register ebx and ecx, and if vm is not running on our environment, the value is others. so cloud-init will not block a long time when call datesource's get_data() method if it's use network

[Scott Moser (smoser)]

Junjie,
This looks great.

You should also make a change to tools/ds-identify.

Then, thanks!

I'll look at this again on monday.

review: Needs Fixing

[Scott Moser (smoser)]

Junjie,
Thanks again. I've put some changes in at
 http://paste.ubuntu.com/24625947/
And updated the commit message here.

Please integrate those changes into this branch, test and then comment.

I'm really happy to see AliYun supported by default.

Scott

review: Needs Fixing

[Scott Moser (smoser)]

Junjie,
I've proposed a merge at
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/324625
that has your changes and then my suggested changes on top.

I'd appreciate your feedback there.

[Junjie.Wang (jingni.wjj)]

> Junjie,
> I've proposed a merge at
> https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/324625
> that has your changes and then my suggested changes on top.
>
> I'd appreciate your feedback there.

I am sorry for late reply，i review this code that is good ，and test it in our AliYun paltform ,it also work fine.thanks very much

[Scott Moser (smoser)]

I marked this merged based on the other branch being merged.
Thanks again, Junjie.

diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index dbafead..5b85fea 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -20,6 +20,7 @@ RUN_CLOUD_CONFIG = '/run/cloud-init/cloud.cfg'
 CFG_BUILTIN = {
     'datasource_list': [
         'NoCloud',
+        'AliYun',
         'ConfigDrive',
         'OpenNebula',
         'DigitalOcean',
diff --git a/cloudinit/sources/DataSourceAliYun.py b/cloudinit/sources/DataSourceAliYun.py
index 9debe94..86dfbf1 100644
--- a/cloudinit/sources/DataSourceAliYun.py
+++ b/cloudinit/sources/DataSourceAliYun.py
@@ -4,8 +4,10 @@ import os
 
 from cloudinit import sources
 from cloudinit.sources import DataSourceEc2 as EC2
+from cloudinit import util
 
 DEF_MD_VERSION = "2016-01-01"
+ALIYUN_PRODUCT = "Alibaba Cloud ECS"
 
 
 class DataSourceAliYun(EC2.DataSourceEc2):
@@ -24,7 +26,11 @@ class DataSourceAliYun(EC2.DataSourceEc2):
 
     @property
     def cloud_platform(self):
-        return EC2.Platforms.ALIYUN
+        product = util.read_dmi_data('system-product-name')
+        if product == ALIYUN_PRODUCT:
+            self._cloud_platform = EC2.Platforms.ALIYUN
+
+        return self._cloud_platform
 
 
 def parse_public_keys(public_keys):
diff --git a/tests/unittests/test_datasource/test_common.py b/tests/unittests/test_datasource/test_common.py
index c08717f..7649b9a 100644
--- a/tests/unittests/test_datasource/test_common.py
+++ b/tests/unittests/test_datasource/test_common.py
@@ -36,6 +36,7 @@ DEFAULT_LOCAL = [
 ]
 
 DEFAULT_NETWORK = [
+    AliYun.DataSourceAliYun,
     AltCloud.DataSourceAltCloud,
     Azure.DataSourceAzureNet,
     Bigstep.DataSourceBigstep,