From b3f85cfafd4a4ab6fb8d06ad596ff42e5adbd9ee Mon Sep 17 00:00:00 2001
From: GGGitBoy <1812041288@qq.com>
Date: Fri, 27 Mar 2020 17:19:14 +0800
Subject: [PATCH] Update Aliyun-Driver

---
 .../components/driver-aliyunecs/component.js  | 31 +++++++--
 .../components/driver-aliyunecs/template.hbs  | 66 ++++++++++++++-----
 translations/en-us.yaml                       |  6 +-
 translations/zh-hans.yaml                     |  8 ++-
 4 files changed, 84 insertions(+), 27 deletions(-)

diff --git a/lib/nodes/addon/components/driver-aliyunecs/component.js b/lib/nodes/addon/components/driver-aliyunecs/component.js
index 81c498c97..34fb6b411 100644
--- a/lib/nodes/addon/components/driver-aliyunecs/component.js
+++ b/lib/nodes/addon/components/driver-aliyunecs/component.js
@@ -18,6 +18,7 @@ const OPT_DISK = [
 ];
 
 const DEFAULT_INSTANCE_TYPE = 'ecs.g5.large';
+const DEFAULT_INTERNET_CHARGE_TYPE = 'PayByBandwidth';
 
 export default Component.extend(NodeDriver, {
   intl:     service(),
@@ -32,11 +33,22 @@ export default Component.extend(NodeDriver, {
   images:         null,
   instanceTypes:  null,
 
-  ecsClient: null,
-  step:      1,
+  showCustomApiEndpoint: false,
+  ecsClient:             null,
+  step:                  1,
 
   config: alias('model.aliyunecsConfig'),
 
+  init() {
+    this._super(...arguments);
+    if (!get(this, 'config.internetChargeType')) {
+      set(this, 'config.internetChargeType', DEFAULT_INTERNET_CHARGE_TYPE);
+    }
+    if (get(this, 'config.apiEndpoint')) {
+      set(this, 'showCustomApiEndpoint', true);
+    }
+  },
+
   actions: {
     alyLogin(cb) {
       setProperties(this, {
@@ -299,6 +311,12 @@ export default Component.extend(NodeDriver, {
     }
   }),
 
+  showCustomApiEndpointDidChange: observer('showCustomApiEndpoint', function() {
+    if (!get(this, 'showCustomApiEndpoint')){
+      set(this, 'config.apiEndpoint', '');
+    }
+  }),
+
   diskCategoryChoicesDidChange: observer('diskCategoryChoices.@each.value', function() {
     const systemDiskCategory = get(this, 'config.systemDiskCategory');
     let found = get(this, 'diskCategoryChoices').findBy('value', systemDiskCategory);
@@ -333,10 +351,11 @@ export default Component.extend(NodeDriver, {
 
   bootstrap() {
     const config = get(this, 'globalStore').createRecord({
-      type:            'aliyunecsConfig',
-      accessKeySecret: '',
-      instanceType:    DEFAULT_INSTANCE_TYPE,
-      ioOptimized:     'optimized',
+      type:               'aliyunecsConfig',
+      accessKeySecret:    '',
+      instanceType:       DEFAULT_INSTANCE_TYPE,
+      ioOptimized:        'optimized',
+      internetChargeType: DEFAULT_INTERNET_CHARGE_TYPE,
     });
 
     set(this, 'model.engineInstallURL', 'http://dev-tool.oss-cn-shenzhen.aliyuncs.com/docker-install/1.13.1.sh');
diff --git a/lib/nodes/addon/components/driver-aliyunecs/template.hbs b/lib/nodes/addon/components/driver-aliyunecs/template.hbs
index 16462c25d..ec3722e0b 100644
--- a/lib/nodes/addon/components/driver-aliyunecs/template.hbs
+++ b/lib/nodes/addon/components/driver-aliyunecs/template.hbs
@@ -54,15 +54,22 @@
           {{t "nodeDriver.aliyunecs.apiEndpoint.label"}}
         </label>
         {{#input-or-display
-           editable=(eq step 1)
-           value=config.apiEndpoint
-        }}
-          {{input
-            type="text"
-            class="form-control"
+            editable=(eq step 1)
             value=config.apiEndpoint
-            placeholder=(t "nodeDriver.aliyunecs.apiEndpoint.placeholder")
-          }}
+        }}
+          <Input
+            @type="checkbox"
+            @classNames="form-control"
+            @checked={{showCustomApiEndpoint}}
+          />
+          {{#if showCustomApiEndpoint}} 
+            <Input
+              @type="text"
+              @value={{config.apiEndpoint}}
+              @classNames="form-control"
+              @placeholder={{t "nodeDriver.aliyunecs.apiEndpoint.placeholder"}}
+            />
+          {{/if}}
         {{/input-or-display}}
       </div>
     </div>
@@ -335,6 +342,21 @@
             value=config.imageId
           }}
         </div>
+        <div class="col span-6">
+          <label class="acc-label">
+            {{t "nodeDriver.aliyunecs.aliyunSLB.label"}}
+          </label>
+          <Input
+            @type="text"
+            @value={{config.slbId}}
+            @classNames="form-control"
+            @placeholder={{t "nodeDriver.aliyunecs.aliyunSLB.placeholder"}}
+          />
+        </div>   
+      </div>
+
+      {{#unless config.privateAddressOnly}}
+      <div class="row">
         <div class="col span-6">
           <label class="acc-label">
             {{t "nodeDriver.aliyunecs.internetMaxBandwidth.label"}}
@@ -350,21 +372,29 @@
             <div class="input-group-addon bg-default">Mbps</div>
           </div>
         </div>
-      </div>
-
-      <div class="row">
         <div class="col span-6">
           <label class="acc-label">
-            {{t "nodeDriver.aliyunecs.aliyunSLB.label"}}
+            {{t "nodeDriver.aliyunecs.internetChargeType.label"}}
           </label>
-          {{input
-            type="text"
-            class="form-control"
-            value=config.slbId
-            placeholder=(t "nodeDriver.aliyunecs.aliyunSLB.placeholder")
-          }}
+            <div>
+              <label class="mr-20 hand">
+                <RadioButton
+                  @selection={{config.internetChargeType}}
+                  @value="PayByBandwidth"
+                />
+                {{t "nodeDriver.aliyunecs.internetChargeType.payByBandwidth"}}
+              </label>
+              <label class="hand">
+                <RadioButton
+                  @selection={{config.internetChargeType}}
+                  @value="PayByTraffic"
+                />
+                {{t "nodeDriver.aliyunecs.internetChargeType.payByTraffic"}}
+              </label>
+            </div>
         </div>
       </div>
+      {{/unless}}
 
       <div class="row">
         <div class="col span-6">
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index 056f27656..ab760606d 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -8738,7 +8738,7 @@ nodeDriver:
       placeholder: Your Aliyun Account Access Key Secret
       provided: Provided
     apiEndpoint:
-      label: API Endpoint (Optional)
+      label: Private Aliyun API Server Endpoint
       placeholder: Private Aliyun API Server Endpoint
     instanceOptionsSection:
       label: Instance
@@ -8758,6 +8758,10 @@ nodeDriver:
     aliyunSLB:
       label: Aliyun SLB ID
       placeholder: Aliyun SLB ID
+    internetChargeType:
+      label: EIP Charge Type
+      payByBandwidth: Pay By Bandwidth
+      payByTraffic: Pay By Traffic
     storageSection:
       label: Storage
       detail: Configure the storage for the instances that will be created by this template.
diff --git a/translations/zh-hans.yaml b/translations/zh-hans.yaml
index 751a602aa..0516025fa 100644
--- a/translations/zh-hans.yaml
+++ b/translations/zh-hans.yaml
@@ -8735,8 +8735,8 @@ nodeDriver:
       placeholder: 阿里云访问秘钥所对应的令牌
       provided: 已提供
     apiEndpoint:
-      label: '(可选)阿里云私有部署API地址'
-      placeholder: 阿里云私有部署API地址
+      label: '私有阿里云API地址'
+      placeholder: 私有阿里云API地址
     instanceOptionsSection:
       label: 实例
       detail: 设置即将创建的阿里云实例
@@ -8755,6 +8755,10 @@ nodeDriver:
     aliyunSLB:
       label: 阿里云SLB ID
       placeholder: 阿里云SLB ID
+    internetChargeType:
+      label: EIP计费方式
+      payByBandwidth: 按带宽计费
+      payByTraffic: 按流量计费
     storageSection:
       label: 存储
       detail: 配置通过该模版创建的实例的存储选项