Update BifangApiVariable.txt

.gitlab-ci.yml

@@ -0,0 +1,64 @@
+stages:
+  - deploy #运行的类型，有
+  - deployagain
+ 
+api: #随意填写，起标示作用
+  stage: deploy #和上述的类型对应
+
+  only:
+    - deploy #指定触发分支
+  tags:
+    - "155auto"
+
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-api || true && docker rm auto-custom-clibrary-api || true
+    - cd docker/api
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
+   
+
+cli: #随意填写，起标示作用
+  stage: deploy #和上述的类型对应
+
+  only:
+    - deploy #指定触发分支
+  tags:
+    - "155auto"
+
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-cli || true && docker rm auto-custom-clibrary-cli || true
+    - cd docker/cli
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
+ 
+ 
+156api: #随意填写，起标示作用
+  stage: deployagain #和上述的类型对应
+
+  only:
+    - deploy #指定触发分支
+  tags:
+    - "156auto"
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-api || true && docker rm auto-custom-clibrary-api || true
+    - cd docker/api
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d
+   
+
+156cli: #随意填写，起标示作用
+  stage: deployagain #和上述的类型对应
+
+  only:
+    - deploy #指定触发分支
+  tags:
+    - "156auto"
+  script: 
+    - pwd
+    - docker stop auto-custom-clibrary-cli || true && docker rm auto-custom-clibrary-cli || true
+    - cd docker/cli
+    - docker-compose build
+    - time=`date +%m%d` docker-compose up -d

01-TestCase/tsg_bfapi/setting/KeyringPolicyFile.robot

@@ -23,7 +23,8 @@ Settings-ProxyProfiles-KeyringFile_root-00001
     QueryPolicyFile    ${url}    keyringId=${keyringId}&keyringName=${keyringName}
     # 修改
     ${header_edit}    Set Variable    {"isValid":1,"opAction":"update","returnData":1,"keyringName":"test_edit","keyringType":"end-entity","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa2048","keyringId":"${keyringId}","includeRoot":0}
-    UpdatePolicyMutipartFile    ${url}    Keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
+    #UpdatePolicyMutipartFile    ${url}    Keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
+    UpdatePolicyMutipartFile    ${url}    keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
 
 Settings-ProxyProfiles-KeyringFile_end-entity-00002
     # 新增 end-entity
@@ -34,7 +35,8 @@ Settings-ProxyProfiles-KeyringFile_end-entity-00002
     QueryPolicyFile    ${url}    keyringId=${keyringId}&keyringName=${keyringName}
     # 修改
     ${header_edit}    Set Variable    {"isValid":1,"opAction":"update","returnData":1,"keyringName":"test_edit","keyringType":"end-entity","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa2048","keyringId":"${keyringId}","includeRoot":0}
-    UpdatePolicyMutipartFile    ${url}    Keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
+    #UpdatePolicyMutipartFile    ${url}    Keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
+    UpdatePolicyMutipartFile    ${url}    keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
 
 Settings-ProxyProfiles-KeyringFile_Intermediate-00003
     # 新增 end-entity
@@ -45,4 +47,5 @@ Settings-ProxyProfiles-KeyringFile_Intermediate-00003
     QueryPolicyFile    ${url}    keyringId=${keyringId}&keyringName=${keyringName}
     # 修改
     ${header_edit}    Set Variable    {"isValid":1,"opAction":"update","returnData":1,"keyringName":"test_edit","keyringType":"end-entity","reissueExpiryHour":0,"crl":"null","publicKeyAlgo":"rsa2048","keyringId":"${keyringId}","includeRoot":0}
-    UpdatePolicyMutipartFile    ${url}    Keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
+    #UpdatePolicyMutipartFile    ${url}    Keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}
+    UpdatePolicyMutipartFile    ${url}    keyrings/end-entity/    tang-ca-v3-www.amazon.cn-cer.pem    tang-ca-v3-www.amazon.cn-key.pem    ${header_edit}

03-Variable/BifangApiVariable.txt

@@ -1,8 +1,8 @@
 *** Variables ***
 #登录类型：api | cli | ${None}（tsg mib） | 未指定，默认为ui
-${loginType}      api
+${loginType}     cli
 #执行环境是否Widonws
-${systemType}     Windows
+${systemType}     Linux
 #API配置信息
 ${host}           192.168.40.120
 ${port}           8080
@@ -10,12 +10,12 @@ ${authmode}       1
 ${authCode}       ${EMPTY}
 ${ldapId}         27
 ${version}        v1
-${username}       uitest
+${username}       testno
 ${password}       111111
 ${encodePassword}    ${EMPTY}
 ${token}          ${EMPTY}
 #[Documentation]    测试终端IP统一配置
-${testClentIP}    192.168.50.2
+${testClentIP}    192.168.41.68
 ${testSubscriberID}    $test2
 #自动化标签
 ${userTagIds}     ${EMPTY}
@@ -26,7 +26,7 @@ ${addTestClentIPFlag}    1
 ${policyVerificationSleepSeconds}    20
 #策略验证后到验证策略日志需等待时间
 ${policyLogVerificationSleepSeconds}    60
-${path}           E:/auto_git/eclipsegit/tsg_autotest/05-Other/
+${path}           /usr/src/python/autotsg/05-Other
 ${curlbatpath}    ${path}/curl/
 ${mailpath}       ${path}/mail/
 ${responsePageFiles}    ${path}/response_pages_files/
@@ -59,4 +59,4 @@ ${snmpCommunity}    public
 # SNMP服务测试变量[end]
 #API配置信息
 ${oamHost}	192.168.40.210
-${oamPort}	50080
+${oamPort}	50080

docker/api/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.1'
+services:
+  auto-custom-clibrary:
+    image: 192.168.41.68/robotframework/auto-custom-clibrary:3.0
+    restart: always
+    container_name: auto-custom-clibrary-api
+    environment:
+      TZ: Asia/Shanghai     
+    working_dir: /usr/src/python   
+    command: robot -i tsg_bf_api -d api/$time/ autotsg
+    privileged: true
+    volumes:
+      - /home/autotsg-gao:/usr/src/python
+
+      

docker/cli/docker-compose.yml

@@ -0,0 +1,16 @@
+version: '3.1'
+services:
+  auto-custom-clibrary:
+    image: 192.168.41.68/robotframework/auto-custom-clibrary:3.0
+    restart: always
+    container_name: auto-custom-clibrary-cli
+    environment:
+      TZ: Asia/Shanghai
+    working_dir: /usr/src/python
+    environment:
+    - loginType:cli    
+    command: robot -i tsg_device -d  cli/$time/ autotsg
+    privileged: true
+    volumes:
+      - /home/autotsg-gao:/usr/src/python
+