summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-08-21Merge "Add tools for testing FIP"Zhijiang Hu1-0/+63
2017-08-21Add tools for testing FIPZhijiang Hu1-0/+63
After deployment, we can manually use this script to simply test basic FIP connectivity. Change-Id: Iccc3edd71ea4c3d38dbed09411093a96a9679ae7 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-21Merge "delete the HEARTBEAT plane in all_in_one network"Zhijiang Hu1-8/+0
2017-08-21Merge "Add doc for describing CI jobs"Zhijiang Hu3-2/+46
2017-08-21delete the HEARTBEAT plane in all_in_one networkzhouya1-8/+0
There is only one node in all-in-one env,so do not need to configure the HEARTBEAT plane, without this ps,we may get the globals.yml file an extra wrong value of keepalived_interface: '{{ network_interface }}' which is unnecessary for all-in-one env, and will result in keepalive not work, VIP lose, and since we still use VIP in all-in-one env, the whole deployment may fail. Change-Id: Ic1efabb533fd63e95254ad19ccf98adb5da6ae78 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-21detail deploy guide rstzhouya2-15/+61
Change-Id: I0a3dddb1356a8f50f9d0a35d69c39b7a483b7a20 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-21Add doc for describing CI jobsZhijiang Hu3-2/+46
Change-Id: Ief4cdd41324bd1957b581937ad19f4779575c35a Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-18Merge "Sync the kolla version with the upstream"Zhijiang Hu2-2/+2
2017-08-18Merge "Add pytest file for prepare/execute.py"Zhijiang Hu2-1/+56
2017-08-18Sync the kolla version with the upstreamAlex Yang2-2/+2
Please see https://review.openstack.org/#/c/494347/ in openstack/daisycloud-core. Change-Id: I9f8ed06b8d2baef6b27562920722c76f4d01f5b1 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-18Add pytest file for prepare/execute.pyzhongjun2-1/+56
1.Add pytest file test_execute.py for prepare/execute.py. 2.Change the makedirs mode from 0600 to 0700 for test env. Change-Id: Ie29e9e4b4210b170f448faf4df907e55bff1435f Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-18Merge "Modify schemas.py"Zhijiang Hu1-3/+33
2017-08-17Modify schemas.pyAlex Yang1-3/+33
1. add schemas for elements added recently in deploy.yml 2. remove daisy_ip from required list, prepare for generate it auto 3. add main() function to make this file useful in bash Change-Id: Ic7a3a87305f96b064260967862f976e33cdea294 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-17use daisy.conf to build pxe serverzhouya4-13/+41
we use the interface of daisyclient to build the pxe server in tempest.py,but we can use the daisy.conf to build the pxe server instead,this is just the optimization of code Change-Id: I7a75d33aa8f80326750d304fa0a881201e956c57 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-16Fix an error in sed statementAlex Yang1-1/+2
JIRA: DAISY-42 Change-Id: I0fd709bb0dbee42cdc73076773cb635be6ba02cd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-10Add more unit test case in test_get_conf.pyzhongjun3-41/+158
Add more unit test cases by pytest parametrize fixture. Change-Id: I208bcff9af79b73556638e20df96235c4ac60ee2 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-09Merge "Use PDF(POD descriptor file) and correct the mapping of nodes and roles"Zhijiang Hu4-5/+79
2017-08-08Fix bug in baremetal deploy with python scriptAlex Yang1-1/+2
Change-Id: I782c4d732ee8774526b21abd3e8636e65916ce3b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-07Merge "Rename jasmine to daisy4nfv-jasmine"Zhijiang Hu2-3/+3
2017-08-05Revert "Optimize list express to list generator"Zhijiang Hu1-2/+3
This reverts commit e5a787046aff97a9925a35874d2b6535a9a41c0c. Trying to solve [1] Deploy failed!!!.Traceback (most recent call last): File "/home/daisy/deploy/tempest.py", line 94, in prepare_install host_interface_map, vip, isbare) File "/home/daisy/deploy/tempest.py", line 216, in add_hosts_interface add_host_role(cluster_id, host['id'], host_name, host['name'], vip) File "/home/daisy/deploy/tempest.py", line 225, in add_host_role role.name == "COMPUTER"][0] IndexError: list index out of range [1] https://build.opnfv.org/ci/job/daisy-deploy-daily-master/626/consoleFull Change-Id: I4017b4b38fa350a28d9e9dd5b157caab885a80d0 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Rename jasmine to daisy4nfv-jasmineZhijiang Hu2-3/+3
Rename to prevent naming confilct Change-Id: I4f2f9cbb0ccf119901c3f450b3220cd4436de4ec Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Ignore oder in unit test of test_get_conf.pyAlex Yang1-2/+1
Since the result contains a list, so ignore_order should be True in the comparison. Change-Id: Iff4c655312015a55a69b91692ab6f9696715a143 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-04Merge "Fix the assert comparison error in test_get_conf.py"Zhijiang Hu3-31/+36
2017-08-04Fix the assert comparison error in test_get_conf.pyzhongjun3-31/+36
Because the list/dict parse can not ensure the element sequence in python, using == method to compare the dict content may cause the fault. we replace it with DeepDiff function. Change-Id: I1db52347e24a0b3968bcf645fd47c4fc5b768dc7 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-04Merge "Support os-odl-nofeature-* as new scenarios"Alex Yang6-7/+118
2017-08-04Support os-odl-nofeature-* as new scenariosZhijiang Hu6-7/+118
Rename all scenarios with "odl_l3" in their name in Euphrates to just "odl". Daisy will keep "odl_l3" and "odl_l2" (in code, not for user) for further reference. Change-Id: Ib762dd808d4f9467b0e6827b8bbed6d9df7e0e0e Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-04Merge "Optimize list express to list generator"Zhijiang Hu1-3/+2
2017-08-04Merge "Add the unit test by pytest for get_conf.py"Zhijiang Hu6-0/+183
2017-08-04Optimize list express to list generatorzhongjun1-3/+2
optimize list express to list generator in tempest.py Change-Id: I8ba12d33a1fc8b33e29fa0a08d7be40a1361bb65 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-03Add the unit test by pytest for get_conf.pyzhongjun6-0/+183
Add the unit test cases by pytest way for get_conf.py, other python files will be added unit test cases gradually in the future. Change-Id: I2495645defcf7ee1b6014b27810ac956eec9f7de Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-03Use PDF(POD descriptor file) and correct the mapping of nodes and rolesAlex Yang4-5/+79
JIRA: DAISY-42 JIRA: DAISY-56 In bare metal deployment, we can use PDF to get MAC addresses of nodes https://gerrit.opnfv.org/gerrit/#/c/38387/. Then we can use the MACs to help to distinguish the discovered nodes and assign roles to them, like virtual deployment in the link https://gerrit.opnfv.org/gerrit/#/c/38381/. Change-Id: Ib0f1a60b8935f528a828f716ccc916b767cfa6f9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-03Merge "Eliminate error logs in virtual deployment"Zhijiang Hu1-13/+19
2017-08-02Eliminate error logs in virtual deploymentAlex Yang1-13/+19
There are some error messages in virtual deployment, such as "Domain not found" or "network is already active". The script forgets to destroy the keep-alived network, and should not destroy a non-existent VM or network. Change-Id: I8d9dce9d70f732bd6942b293e407e1845d81fc39 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-02Merge "use template to replace duplicate xml file"Zhijiang Hu10-949/+28
2017-08-01Merge "Remove useless parameters and rename some parameters in get_conf.py"Zhijiang Hu1-14/+14
2017-08-01use template to replace duplicate xml filezhouya10-949/+28
Change-Id: I9764612171ef3bf2cdfc652420a2b162fcbfab43 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-08-01Remove useless parameters and rename some parameters in get_conf.pyAlex Yang1-14/+14
Change-Id: I47949f44ea609932059374b128018e36590e88fd Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-08-01Jira: DAISY-36 Update doc structureZhijiang Hu12-5/+17
This PS update doc structure according to [1]. Note: This PS also add content to doc for describing the mapping methods for map role to discovered nodes. [1] http://docs.opnfv.org/en/stable-danube/how-to-use-docs/documentation-guide.html?highlight=templates#document-structure-and-contribution Change-Id: I7b2ef916753cddd8cd845abae8c7d5865c49e1ac Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-01Fix typo in patch 38381Alex Yang1-1/+1
JIRA: DAISY-56 controller01 -> $name Change-Id: Icd959ca55079a6ac0bfbd181ff134d7decfb89f5 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31Correct the mapping of nodes and roles in virtual deployAlex Yang7-17/+68
JIRA: DAISY-56 Now the roles are assigned to nodes randomly, because the function 'add_hosts_interface' in tempest.py just uses zip to map the host's name to the host. libvirt_utils.py: get mac addresses from VM environment.py: save the mac addresses daisy_server.py: write a new deploy.yml which contains the mac addresses and copy the file to daisy server get_conf.py: get mac addresses from the new deploy.yml tempest.py: assigned roles to nodes when the mac addresses matched controller.xml: increase the RAM to make difference with computer nodes deploy.sh: apply this change to bash script Change-Id: Ia61b60d39d319c5d01e3505727fafc63a0585858 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-31use only one file get_conf.py to get configuration data from deploy.ymlzhouya3-58/+47
just move the code from get_para_from_deploy to get_conf file no functionality change. Change-Id: I86aa1325ff37cb2ae0784c9487e62e95cc23f644 Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-07-28Do not provide ipmi user and password in virtual deploymentAlex Yang1-5/+7
Change-Id: Ib7989bed237a03cdab01fea89aba4e2038815e5f Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-28Merge "Solve double container removal problem"Zhijiang Hu1-1/+1
2017-07-27Merge "Convert the bash commands in post.sh to python code"Zhijiang Hu4-5/+84
2017-07-26Solve double container removal problemZhijiang Hu1-1/+1
From [1], We got an error from docker: "No such container: daisy" while issuing "docker rm -v -f daisy", this OK because we do docker run --rm before this. So it is safe to add "|| true" after "docker rm -v -f daisy". [1] https://build.opnfv.org/ci/job/daisy-build-daily-master/500/console Change-Id: I3d17595156f1b6181a84d9a03e2cd6ddff275eb3 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-26Close upstream merge windowZhijiang Hu1-1/+1
Switch to upstream daisy's stable/ocata branch Change-Id: I5ff0b0a28a8d2f76f0cb813af8f8241175bb6054 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-26Convert the bash commands in post.sh to python codeAlex Yang4-5/+84
According to the comment from Serena in the patch https://gerrit.opnfv.org/gerrit/#/c/37857/, the bash code in post.sh can be implemented by python, and the deploy script can call post/execute.py directly. Change-Id: Ibcf86fc2b6ee3942e4082384c9d4075d608b7294 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-07-25Merge "Sync some patches of bash script to python"Zhijiang Hu4-4/+36
2017-07-24when deploy have failed print the api logroot2-0/+6
Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-20Sync some patches of bash script to pythonAlex Yang4-4/+36
Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e Signed-off-by: Alex Yang <yangyang1@zte.com.cn>