summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-10-10Merge "Create iso file during build"Zhijiang Hu3-7/+12
2017-10-09Merge changes from topic 'unittest2'Zhijiang Hu14-76/+930
* changes: Add more test function and case in test_utils.py Add more test cases in test_deploy.py
2017-10-08Create iso file during buildZhijiang Hu3-7/+12
Change-Id: I6ddfe8e291ea8f6d673bd82c4df310d63f61a130 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-29Exit deploy when exception occurredAlex Yang2-0/+9
Exception occurred in [1]. But te deployment didn't stop and blocked for a long time. [1] https://build.opnfv.org/ci/job/daisy-deploy-baremetal-daily-master/169/ Change-Id: I0d5639da1e0d011855df0b0651328f11168e5d01 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-29Add more test function and case in test_utils.pyzhongjun9-61/+584
Add more test functions and test case in test_utils.py, test_daisy_server.py and test_environment.py. Change-Id: I7e4ea6993205e1d2f7cc8202820a3ada99613910 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-28Merge "Switch to upstream daisy's master branch"Zhijiang Hu1-1/+1
2017-09-26Switch to upstream daisy's master branchZhijiang Hu1-1/+1
Change-Id: I7a88d8b65168356420aee2042ac3902834633477 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-27Merge "Fix delete_virtual_network function call"Zhijiang Hu1-1/+1
2017-09-27Add more test cases in test_deploy.pyzhongjun6-18/+349
Add more test cases in test_deploy.py and test_environment.py Change-Id: I6adf3f51aa7a436387c2da8a8dc8c67f6e5a70db Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-26securelab parameter bug fixZhijiang Hu3-24/+37
This is a bug fix of 02e1f1c8ab3f3857ca2370f98575ccbf41f12a01 Change-Id: I628c5e33a76bc28e0af139e338b29a7393700525 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-26Fix delete_virtual_network function callzhongjun1-1/+1
create_daisy_server_network method in VirtualEnvironment class calls self.delete_virtual_network, but it doesn't exist, actually it should be delete_virtual_network function in module libvirt_utils.py. Change-Id: I381e916097744827a22d311b275611df38d8e1be Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-26Fix unittestAlex Yang2-2/+3
Change-Id: I82086b85da488e183589af7b4adbd6c80835c039 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-26Merge "Add some unittest files such as test_nova.py"Zhijiang Hu9-16/+939
2017-09-25Merge "Use pxe bridge to replace the bridge in VM template"Zhijiang Hu4-13/+42
2017-09-25Merge "Support passing securelab dir as a optional param"Zhijiang Hu1-4/+10
2017-09-24Support passing securelab dir as a optional paramZhijiang Hu1-4/+10
Change-Id: I5caadb42b3890858e7642a5fd260392370dbbfc8 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-21Add some unittest files such as test_nova.pyzhongjun9-16/+939
1.Add test_glance.py, test_neutron.py and test_nova.py unittest files, and modify the neutron.py to adapt the unittest. 2.Add some unittest functions in test_post_execute.py, test_deploy.py, test_keystoneauth.py. 3.rename test_prepare_execure.py to test_prepare_execute.py. Change-Id: Ie0640d133e27c558648416a6a5cf044a00ffa67f Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-21Use pxe bridge to replace the bridge in VM templateAlex Yang4-13/+42
1. Eliminate hard code about pxe bridge 2. Replace the bridge in daisy VM template with the pxe bridge provided by jenkins Change-Id: I7a8463181847417d10705ce9ff4db6e68d505c6d Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-20Merge "Some optimizations about unit test"Alex Yang3-28/+26
2017-09-20Merge "Add the pytest file test_environment.py"Alex Yang4-1/+771
2017-09-18Add the pytest file test_environment.pyzhongjun4-1/+771
1.Add the pytest file test_enviroment.py 2.Add the pytest file test_daisy_server.py Change-Id: If679c3a7279a915d078dd3008bcfc56be6dccc3e Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-18Some optimizations about unit testAlex Yang3-28/+26
Remove some "if/else". Rename a variables and a file. Split a testcase in two cases. Change-Id: Ic107845ac8eff41ba20e1501c93925586d6cbde9 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-18Merge "Use virsh reset instead of reboot"Alex Yang1-2/+2
2017-09-16Merge "Update doc content for Euphrates"Alex Yang3-13/+12
2017-09-16Use virsh reset instead of rebootAlex Yang1-2/+2
Sometimes the VMs do not reboot when using "virsh reboot". The virtual depoyment CI jobs failed recently. Change-Id: Id8b3ef638a7ba8f584c6e4c03d11e77d2919a35b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-13Update doc content for EuphratesZhijiang Hu3-13/+12
Change-Id: Ide23a73bd0f610bf949431538e64788c2dae0e12 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-14Merge "Add the pytest file test_deploy.py"Zhijiang Hu6-8/+243
2017-09-12Eliminate hard code about ipmi info in bash scriptAlex Yang2-27/+64
Change-Id: I642d130566137dff727b7227658afe6ace9473d6 Signed-off-by: Alex Yang <yangyang1@zte.com.cn> (cherry picked from commit 94d3957c5aba2db70d06929ac9538280a71c6641)
2017-09-12Merge "Eliminate hard code about ipmi info in bash script"Zhijiang Hu2-27/+64
2017-09-12Eliminate hard code about ipmi info in bash scriptAlex Yang2-27/+64
Change-Id: I642d130566137dff727b7227658afe6ace9473d6 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-11Add developer doc for deployment detailZhijiang Hu2-0/+59
Change-Id: I03c283222060677f7ce7b5ddb0241db78e52b481 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-11Add the pytest file test_deploy.pyzhongjun6-8/+243
1.add the pytest file test_deploy.py 2.fix the tmpfile clearup issue. Change-Id: I3a7e0f9199f1bf518b332fd3e9884c8f084575ae Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-09-10get_mac_addresses_for_virtual() suppors all-in-one envZhijiang Hu1-6/+16
Change-Id: I6514292b16c784ced0dcb82d639fe10b425d63e2 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-09Export kolla preparation log when install failedAlex Yang1-6/+18
Change-Id: I08844b899de2dba539b3c3942345f83d1ac3c198 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-08Merge "Kill zip() in add_hosts_interface()"Zhijiang Hu1-12/+20
2017-09-06Kill zip() in add_hosts_interface()Zhijiang Hu1-12/+20
Since mac_address_map is always avaliable, there is no need to pass host_name into add_hosts_interface() and use zip() to do strange combination any more. This change: 1) Is trying to make code more understandable 2) Also delete a unused parameter for add_host_role() Change-Id: Icef47cdf7f1a1522600b351f6e2f47d6f62efa9f Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-06Merge "Eliminate hard coding about ipmi info"Zhijiang Hu4-19/+59
2017-09-06Eliminate hard coding about ipmi infoAlex Yang4-19/+59
1. Eliminate hard coding 2. Add ipmi info in schemas 3. Add unit test Change-Id: I4561bbc9454e02fd1de2106645db341a4129245b Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2017-09-05Add doc for building kolla imageZhijiang Hu3-1/+43
Change-Id: I7d25c13221e60d40801dc694efe8c32c31ebfabf Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-05Merge "Uniform the variable definition makefile_path.sh"Zhijiang Hu1-6/+9
2017-09-02Enlarge kolla log output size to 5000 linesZhijiang Hu1-1/+1
Change-Id: I9916d494e67b788d491b44fc1d0202d5ac20e710 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-09-01Merge "Add some unit test files test_netwrok.py"Zhijiang Hu5-0/+285
2017-09-01Uniform the variable definition makefile_path.shzhongjun1-6/+9
replace all the "${TOOLS_PATH}/setup/bin_temp" statement to the variable $target_dir Change-Id: I62b95f1780a7cd5e0c8c4e60a5b0661a2a9937bd Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-31Add some unit test files test_netwrok.pyzhongjun5-0/+285
1.add the below unit test files: test_netwrok.py/test_schemas.py/test_query.py/test_utils.py 2.add the corresponding test conf file deploy_virtual_error.yml. Change-Id: I01292d4c94b9d6159597961a0cab515f57727ec3 Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
2017-08-31Merge "Add some test case in test_post_execute.py"Zhijiang Hu7-21/+163
2017-08-31Merge "change update doc"Zhijiang Hu1-2/+4
2017-08-31Merge "Support build with extent tag"Zhijiang Hu1-21/+61
2017-08-31change update docZhijiang Hu1-2/+4
Change-Id: I3593593d540bf0e74ae1642f3450d4945af8a334 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-30Support build with extent tagZhijiang Hu1-21/+61
Kolla offcial image tag is, for example, 4.0.2. Daisy images can be names as 4.0.2.n And Kolla supports upgrading not only from 4.0.2 to 4.0.3, but also from 4.0.2 to 4.0.2.n. It is a convenient way for Daisy to publish its own small changes into images for upgrading. Change-Id: I9d283e1ffa452ac3e04046ab6c96d018d42e0bf9 Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
2017-08-30Merge "Refactor the parameters checking"Zhijiang Hu1-41/+37