summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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-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>
2017-07-18md5sum check for cirros imageZhijiang Hu2-13/+35
Change-Id: I874c40eb5da54c38ce8aa2d1fb1840a8aee22b4c Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-07-13add sdn_controller_ip to admin_openrc.shroot1-1/+13
Change-Id: I3af46368109bc5358fd0cc61a43f5be60479eab3 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07Enable HA scenarioszhongjun2-2/+7
Enable HA scenario options due to support HA function in upsteam. Change-Id: Ie1889afc1a149f171a9b324eb284fd650baed397 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-07-07Merge "add heartbeat interface introduction in docs"Zhijiang Hu2-0/+4
2017-07-07add heartbeat interface introduction in docsroot2-0/+4
Change-Id: Iaf206f9ea5962410c859ad6f84b03ef1a1aa7771 Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-07add extra interface to enable the keepablived plane and the api planeroot16-177/+245
Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda Signed-off-by: root <zhou.ya@zte.com.cn>
2017-07-03os-nosdn-nofeature-ha as a valid scenarioZhijiang Hu1-1/+1
Project job deployment job uses os-nosdn-nofeature-ha currently, so we need to treat os-nosdn-nofeature-ha as a valid scenario to let the job continue to work. Change-Id: Ib9311ada9b043b1f695f43edb51adbb3714d3356 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-30Merge "Initial merge of BM Installation guide"Zhijiang Hu3-9/+138
2017-06-30Merge "Jira: DAISY-36 Initial merge of release-note"Zhijiang Hu4-7/+152
2017-06-29Jira: DAISY-36 Initial merge of release-noteZhijiang Hu4-7/+152
Also fix some index.rst Change-Id: I6aae9fbc5821e8a1c65a02c6b8926e42a10c19cb Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-29Initial merge of BM Installation guideZhijiang Hu3-9/+138
Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-29Add an missing parameter and fix a typo in daisy_server.pyAlex Yang1-3/+4
Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-28Merge "Add scenario arg check"Zhijiang Hu1-1/+22
2017-06-28Add scenario arg checkzhongjun1-1/+22
Add the scenario argument valid check in deploy.sh. Change-Id: Ifeeed3882b22ba379975c2356d761e0536c5c2c9 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-06-28Enlarge the RAM of the nodes in virtual deploymentAlex Yang8-16/+16
Now the RAM of controller node in virtual deploymeny is only 4GB. [root@host-10-20-11-6 ~]# free -h total used free shared buff/cache available Mem: 3.7G 3.2G 145M 1.7M 408M 191M Swap: 4.0G 4.0G 2.3M Since the RAM on the deploy server is at least 64GB (see installation guide), we can enlarge every node's RAM to improve the performance. Signed-off-by: Alex Yang <yangyang1@zte.com.cn> Change-Id: Ie4e1297697e349a6b3edf0fa0c54eeeb94255ca8 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-27Merge "Adapt the scenario arg add in tempset.py"Alex Yang3-26/+56
2017-06-27Adapt the scenario arg add in tempset.pyzhongjun3-26/+56
1.adapt the scenario argument add in tempset.py, detail please refer to https://gerrit.opnfv.org/gerrit/#/c/36229/5/deploy/tempest.py. 2.bugfix to update the self.deploy_file with the constructed final deploy file in deoploy.py. Change-Id: Ia46720649a2361f0b84749925d2c0dede78ccdb5 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-06-26Update VM intallation network setup for ODL scenarioZhijiang Hu1-30/+35
Change-Id: Ie26ca7d81b8d293fbcdc73d5bfa6f2bdbe21e215 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-06-26Correct the kolla image version in makefile_patch.shAlex Yang1-1/+1
Makefile_patch.sh is missed in patch 36229. Change-Id: I8da88a0f8220061b4ad03711c1a52715703dd579 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-06-24enable opendaylightzhouya3-2/+32
Change-Id: I759d864efa524c0d564b9d93aa480e155149adaa Signed-off-by: zhouya <zhou.ya@zte.com.cn>
2017-06-23Merge "add the scenarios option"Zhijiang Hu9-5/+371
2017-06-23add the scenarios optionzhongjun9-5/+371
Add the scenarios option and yaml configuration files, currently only support three scenarios as below. os-nosdn-nofeature-noha/os-odl_l3-nofeature-noha/ os-odl_l2-nofeature-noha. we will support more secnarios such as os-odl_l3-nofeature-ha in future. Change-Id: I24d7875208e277f6ee1b794c0033d5fee6b5e371 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>