Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
JIRA: DAISY-42
Change-Id: I0fd709bb0dbee42cdc73076773cb635be6ba02cd
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
Add more unit test cases by pytest parametrize fixture.
Change-Id: I208bcff9af79b73556638e20df96235c4ac60ee2
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
|
|
|
|
Change-Id: I782c4d732ee8774526b21abd3e8636e65916ce3b
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
|
|
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>
|
|
Rename to prevent naming confilct
Change-Id: I4f2f9cbb0ccf119901c3f450b3220cd4436de4ec
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
|
|
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>
|
|
|
|
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>
|
|
|
|
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>
|
|
|
|
|
|
optimize list express to list generator in tempest.py
Change-Id: I8ba12d33a1fc8b33e29fa0a08d7be40a1361bb65
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
|
|
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>
|
|
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>
|
|
|
|
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>
|
|
|
|
|
|
Change-Id: I9764612171ef3bf2cdfc652420a2b162fcbfab43
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
|
|
Change-Id: I47949f44ea609932059374b128018e36590e88fd
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
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>
|
|
JIRA: DAISY-56
controller01 -> $name
Change-Id: Icd959ca55079a6ac0bfbd181ff134d7decfb89f5
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
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>
|
|
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>
|
|
Change-Id: Ib7989bed237a03cdab01fea89aba4e2038815e5f
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
|
|
|
|
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>
|
|
Switch to upstream daisy's stable/ocata branch
Change-Id: I5ff0b0a28a8d2f76f0cb813af8f8241175bb6054
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
|
|
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>
|
|
|
|
Change-Id: I6047340f7f0d2c7b6b175335bdbf836a2a8d0a9c
Signed-off-by: root <zhou.ya@zte.com.cn>
|
|
Change-Id: Ia1eb59e62b1bb98b1871ec591e2c925c1734cc2e
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
Change-Id: I874c40eb5da54c38ce8aa2d1fb1840a8aee22b4c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
|
|
Change-Id: I3af46368109bc5358fd0cc61a43f5be60479eab3
Signed-off-by: root <zhou.ya@zte.com.cn>
|
|
Enable HA scenario options due to support HA function in upsteam.
Change-Id: Ie1889afc1a149f171a9b324eb284fd650baed397
Signed-off-by: zhongjun <zhong.jun@zte.com.cn>
|
|
|
|
Change-Id: Iaf206f9ea5962410c859ad6f84b03ef1a1aa7771
Signed-off-by: root <zhou.ya@zte.com.cn>
|
|
Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda
Signed-off-by: root <zhou.ya@zte.com.cn>
|
|
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>
|
|
|
|
|
|
Also fix some index.rst
Change-Id: I6aae9fbc5821e8a1c65a02c6b8926e42a10c19cb
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
|
|
Change-Id: I9964f0d75ae879c6b86d245f2007841236a0b931
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
|
|
Change-Id: I339508f1c07a9bbefa389c6f6eb5e53640a79417
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
|
|
|