Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

R2.22.x #79

Open
wants to merge 267 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
267 commits
Select commit Hold shift + click to select a range
d8c09ef
Merge "Fix for test_db_alarms" into R3.0
May 18, 2016
2ada8c2
Merge "UI changes merge" into R3.0
May 18, 2016
2d4b527
Fixed some issues in intf mirroring test code
Ankitja May 17, 2016
13dce92
Adding test cases for server-manager tags.
ritamganguly May 18, 2016
694dea0
Merge "Fixed some issues in intf mirroring test code" into R3.0
May 18, 2016
b90fc5a
Agent Introspect function to find DNS server assigned to Vrouter
pulkitt May 9, 2016
4a85cff
Support providing test tags through testrunner
hkumarmk May 18, 2016
346fa11
Adding topology creation before and after upgrade test.
ritamganguly May 19, 2016
8d22520
corrected typo
shajuvk May 18, 2016
61d1042
Pass connections of project object for IPAM creation.
ritamganguly May 19, 2016
c2ab817
setup webui sanity requirements when required
hkumarmk May 12, 2016
5866a44
Merge "Agent Introspect function to find DNS server assigned to Vrout…
May 19, 2016
561f89b
Merge "delete the container in nova first then in docker and sleep to…
May 19, 2016
90abda0
Merge "SVC Script fixes" into R3.0
May 19, 2016
8dee2a8
Merge "Adding test cases for server-manager tags." into R3.0
May 19, 2016
8687b3f
Fix bugs in commit ac1a64 and enhance Hping3 class
May 20, 2016
cf6ffe7
Fix for test_cfgm_alarms failure on single node
Ankitja May 20, 2016
18bf861
Moving the error under the right block
ganeshahv May 20, 2016
12ae00f
Merge "Pass connections of project object for IPAM creation." into R3.0
May 20, 2016
5e68037
Small change in intf_mirroring/verify.py
Ankitja May 20, 2016
cc79337
Merge "corrected typo" into R3.0
May 20, 2016
f63cf67
Merge "Moving the error under the right block" into R3.0
May 20, 2016
4629ab8
Merge "setup webui sanity requirements when required" into R3.0
May 21, 2016
bfa389f
Flow -l o/p has changed to include an extra blank line
ritamganguly May 23, 2016
282f723
Merge "Small change in intf_mirroring/verify.py" into R3.0
May 23, 2016
c0f78ea
Merge "Added a module to update Port properties" into R3.0
May 23, 2016
cd956f3
Merge "Fix for test_cfgm_alarms failure on single node" into R3.0
May 23, 2016
6f5b307
Merge "Adding topology creation before and after upgrade test." into …
May 23, 2016
818f8bd
Merge "Support providing test tags through testrunner" into R3.0
May 23, 2016
7b8d893
Merge "Flow -l o/p has changed to include an extra blank line between…
May 23, 2016
8ab49da
Using 'webui' variable that is already set through testbed/default
pavanap May 24, 2016
215862f
Fix for alarm test cases on Centos
Ankitja May 24, 2016
1f90af8
Merge "Fix bugs in commit ac1a64 and enhance Hping3 class" into R3.0
May 24, 2016
80b2c7b
Fix for AnalyticsTestSanity3.test_verify_process_status_config
Ankitja May 24, 2016
b16a63d
Merge "Fix for alarm test cases on Centos" into R3.0
May 24, 2016
3875c18
Merge "Fix for AnalyticsTestSanity3.test_verify_process_status_config…
May 25, 2016
41ca3a9
Merge "Using 'webui' variable that is already set through testbed/def…
May 25, 2016
aad96ef
Added fix to topo_steps create_project to pass project_username and …
aswanikumar90 May 24, 2016
7a9a480
Fix for test_analytics.AnalyticsTestSanity.test_message_table
Ankitja May 25, 2016
d04f7d9
Fix for test_bgprouter_uve_for_xmpp_and_bgp_peer_count
Ankitja May 25, 2016
4aae024
Fix for AnalyticsTestSanity3.test_verify_process_status_agent
Ankitja May 25, 2016
7b46c6d
Merge "Added fix to topo_steps create_project to pass project_userna…
May 25, 2016
f2ada9d
Use right syntax while splitting a string across two lines
May 26, 2016
47b5206
Fix for test_db_alarms
Ankitja May 26, 2016
1b26e6c
Use get_build_sku() instead of get_openstack_release() to get sku
pavanap May 26, 2016
3573aab
Changing a proc statement to infer hostname from IP address using
pulkitt May 25, 2016
637e879
Committing review id 19482 to new infra
sandip-d May 18, 2016
2ad10a1
Merge "Fix for test_db_alarms" into R3.0
May 27, 2016
1f0ff07
Increasing Retries for Stack creation, update and deletion.
ganeshahv May 27, 2016
fcc8c7f
Merge "Fix for test_analytics.AnalyticsTestSanity.test_message_table"…
May 27, 2016
00ba79b
Merge "Fix for test_bgprouter_uve_for_xmpp_and_bgp_peer_count" into R3.0
May 27, 2016
6a8dcd1
Merge "Changing a proc statement to infer hostname from IP address us…
May 27, 2016
8fda30f
Using the configured project name for UI config
pavanap May 27, 2016
8f44f45
Adding change in neutron base code to support all zero AAP mac
May 27, 2016
408049f
Merge "Use get_build_sku() instead of get_openstack_release() to get …
May 29, 2016
d961254
Merge "Using the configured project name for UI config" into R3.0
May 29, 2016
76fd225
Merge "Fix for AnalyticsTestSanity3.test_verify_process_status_agent"…
May 30, 2016
04d8ce2
Merge "Increasing Retries for Stack creation, update and deletion." i…
May 31, 2016
41f95de
Merge "Adding change in neutron base code to support all zero AAP mac…
May 31, 2016
d08923f
Merge "Committing review id 19482 to new infra" into R3.0
May 31, 2016
6108b6b
Enhance automation tests on heat
sunilbasker-jnpr May 25, 2016
3cdf3b0
Catching the CommandTimeout exception
ganeshahv Jun 2, 2016
63018f9
Remove import of strutils which is not used
Jun 2, 2016
34bbd25
Analytics fix for sanity failures
sandip-d Jun 2, 2016
8cb0713
Merge "Analytics fix for sanity failures" into R3.0
Jun 2, 2016
f793f7a
wait till vm is active before updating image details:
alokkumar223 Jun 2, 2016
29ef57c
Merge "Catching the CommandTimeout exception" into R3.0
Jun 3, 2016
a98e808
Adding support for get and set config thru netconf
ganeshahv Jun 2, 2016
253689c
fix script issues found in regression,partial bug 1571996:
alokkumar223 Jun 3, 2016
7391f19
Merge "wait till vm is active before updating image details: otherwis…
Jun 3, 2016
79a4cf1
Merge "fix script issues found in regression,partial bug 1571996: - s…
Jun 3, 2016
46d95a7
UI changes in create_vm, monitor page testcases - fixture
pavanap Jun 5, 2016
22b725f
Merge "Adding support for get and set config thru netconf" into R3.0
Jun 6, 2016
87ab04d
Wait till SVM is up
sunilbasker-jnpr Jun 8, 2016
55b879e
UI changes in VM and monitor testcases - fixtures
pavanap Jun 10, 2016
baccefb
Merge "Wait till SVM is up" into R3.0
Jun 13, 2016
76ea77f
Fix for test_verify_generator_collector_connections
Ankitja Jun 13, 2016
62cd96c
Added fabutils.py with remote_cmd to use in wider usecases
hkumarmk May 18, 2016
dbc1b4d
Including timeout for config section.
skiranh Jun 14, 2016
331eb15
Correct syntax error in few places
Jun 14, 2016
903c514
Fix: run command as_daemon is failing
hkumarmk Jun 14, 2016
c25dd97
Merge "Fix: run command as_daemon is failing" into R3.0
Jun 14, 2016
e669483
Merge "Added fabutils.py with remote_cmd to use in wider usecases" i…
Jun 15, 2016
acbe5be
Fix background command failure on remote_cmd also
hkumarmk Jun 15, 2016
6e69da0
Merge "Correct syntax error in few places" into R3.0
Jun 15, 2016
bfe7c65
Merge "Including timeout for config section. - Saw RPC timeout error…
Jun 15, 2016
b7e7cd3
A method to get IP of DNS server of a subnet(as mentioned in IPAM)
pulkitt Jun 6, 2016
17f85d0
Adding xmpp knobs
skiranh Jun 16, 2016
d6cb41a
Merge "Fix background command failure on remote_cmd also" into R3.0
Jun 16, 2016
f25c0d7
Added remote_copy, updated remote_cmd
hkumarmk Jun 16, 2016
0b34018
Modified a Test case of VDNS to verify record order as round robin
pulkitt Jun 15, 2016
a8cd825
UI changes in VM creation, fip, monitor cases - UI fixture
pavanap Jun 15, 2016
aa978c6
Merge "UI changes in VM creation, fip, monitor cases - UI fixture" in…
Jun 19, 2016
fea8259
Merge "Modified a Test case of VDNS to verify record order as round r…
Jun 20, 2016
320a58f
Merge "Adding xmpp knobs - Added 2 xmpp knobs" into R3.0
Jun 20, 2016
5be6ca8
Merge "Added remote_copy, updated remote_cmd" into R3.0
Jun 20, 2016
a1797f1
Added back remove_unwanted_output
hkumarmk Jun 22, 2016
53bf173
Add project selection under monitor > instance
pavanap Jun 22, 2016
df81079
Handling Instance IP check in IPv6 cases
ganeshahv Jun 22, 2016
67ec7fe
Merge "Add project selection under monitor > instance" into R3.0
Jun 23, 2016
5f479b7
Adding exception handling in a vdns proc
pulkitt Jun 13, 2016
64b819e
Merge "Handling Instance IP check in IPv6 cases" into R3.0
Jun 24, 2016
4aa3f90
Merge "Adding exception handling in a vdns proc Also, adding a VNA in…
Jun 27, 2016
ec8191e
Merge "A method to get IP of DNS server of a subnet(as mentioned in I…
Jun 27, 2016
59804a0
Enhancements to support some flow test cases
Jun 24, 2016
287ad80
Adding support for Service Chain v2 testcases
ganeshahv Jun 30, 2016
de7e0f9
Add IPv6 support for ECMP cases
sunilbasker-jnpr Jun 26, 2016
e772715
Added modules for new discovery enhancement R3.0
pulkitt May 6, 2016
9dc739e
Merge "Added modules for new discovery enhancement R3.0" into R3.0
Jul 5, 2016
12cfcea
Merge "Enhancements to support some flow test cases" into R3.0
Jul 5, 2016
8ddb938
Replace asterisks with percent signs
Jul 8, 2016
8a83d7c
Added 3 procs for API, OPS and UI verification for VN edit
ushamani Jul 17, 2016
abb72f7
add method required for 26a1619255eb9eced467fd522c6b2dff80bef0b1:get …
alokkumar223 Jul 11, 2016
57a970c
Merge "add method required for 26a1619255eb9eced467fd522c6b2dff80bef0…
Jul 21, 2016
5d15e3a
Merge "Added 3 procs for API, OPS and UI verification for VN edit" in…
Jul 27, 2016
84a73d6
1. Pass auth header in post_query request
Ankitja Aug 4, 2016
687df9a
Make contrailapi.py usable as a vnc-api related library
Aug 3, 2016
ebf302c
Merge "Make contrailapi.py usable as a vnc-api related library" into …
Aug 11, 2016
4cfa9e1
Change image server to 10.204.216.50
vmahuli Aug 11, 2016
744de9a
Changed the way variable was handled in Vdns test scripts.
pulkitt Aug 12, 2016
c5aa43e
Add missing get_security_group() method to orchestrator.py
Aug 13, 2016
67b5c0e
Retry docker run to avoid test failures because timeout from containerd
hkumarmk Aug 20, 2016
104d759
Install packages required for webui testing while building container
hkumarmk Aug 22, 2016
2e95fd7
Fix for test_svc_mirroring -- Cherry-pick
Ankitja Aug 19, 2016
a516b29
Fix for intf mirroring test cases - Cherry-pick
Ankitja Aug 14, 2016
8e40b05
Fix for analytics test cases on HA setup -- Cherry-pick
Ankitja Aug 14, 2016
90558b4
Merge "Fix for intf mirroring test cases - Cherry-pick" into R3.0
Aug 30, 2016
8dda62a
Merge "Fix for analytics test cases on HA setup -- Cherry-pick" into…
Aug 30, 2016
8ce8cf3
Merge "Changed the way variable was handled in Vdns test scripts." in…
Aug 31, 2016
de7784e
Introducing retry in ns_lookup proc to avoid sleep - ci
pulkitt Aug 31, 2016
dcf7542
Merge "Add missing get_security_group() method to orchestrator.py" in…
Sep 1, 2016
05078de
Modified script to pick the latest vn for edit and corrected logger e…
ushamani Sep 1, 2016
64f69fb
Added 1 second wait time before getting CPU values
pavanap Sep 1, 2016
14b2d69
Merge "Install packages required for webui testing while building con…
Sep 2, 2016
4561512
Merge "Modified script to pick the latest vn for edit and corrected l…
Sep 2, 2016
d07f7c0
Adding new method to configure AAP using VNC API
Sep 7, 2016
164a71f
Merge "Introducing retry in ns_lookup proc to avoid sleep - ci" into …
Sep 7, 2016
04262b7
Merge "Adding new method to configure AAP using VNC API" into R3.0
Sep 8, 2016
c29857a
Merge "Added 1 second wait time before getting CPU values" into R3.0
Sep 13, 2016
75031fa
Fix for AnalyticsTestSanityWithResource.test_verify_process_status_ag…
Ankitja Aug 5, 2016
8e4e7e6
Fix for alarm test cases <- cherrypick from R3.1
Ankitja Jul 21, 2016
c48c7c9
Fix for test_db_alarms <- Cherrypick from R3.1
Ankitja Jul 25, 2016
3a0a1c9
Alarm schema related script changes <-Cherrypick from R3.1
Ankitja Aug 7, 2016
148f96d
Changed the dom object for port name
pavanap Sep 19, 2016
45f3061
adding DISTRO and SKU to topology info in the report
msudhee Sep 19, 2016
d383314
Merge "Changed the dom object for port name" into R3.0
Sep 19, 2016
7f3db93
Enhancing ECMP test code
ganeshahv Sep 19, 2016
79c553f
Fix for alarm test cases
Ankitja Sep 20, 2016
5641ea2
Merge "Enhancing ECMP test code" into R3.0
Sep 21, 2016
c240ddc
Commiting ECMP related changes in R3.1 and master
ganeshahv Sep 21, 2016
65dbe97
Retry docker run to avoid test failures because of timeout
pavanap Sep 22, 2016
94604cc
Fixed mismatched values on vrouter advanced page
pavanap Sep 22, 2016
48164e2
Merge "Retry docker run to avoid test failures because of timeout" in…
Sep 22, 2016
64672c7
Merge "Fixed mismatched values on vrouter advanced page" into R3.0
Sep 23, 2016
54fbad6
Missed adding the pt key
ganeshahv Sep 23, 2016
d7bfe96
Fix for verify_cfgm_alarms test cases on centos and redhat
Ankitja Sep 23, 2016
0654a0f
Merge "Fix for verify_cfgm_alarms test cases on centos and redhat" in…
Sep 24, 2016
b2811c4
Changes made to support evpn cases
aswanikumar90 Aug 1, 2016
19ad7e7
Merge "Changes made to support evpn cases" into R3.0
Sep 26, 2016
91a1e46
When refresh is set, get latest data from api server
Sep 26, 2016
05f54e2
Wait till vm is launched before populating details from vm obj
Aug 3, 2016
1ee86a8
Changes reqd for node shutdown/VIP move related testcases
Sep 8, 2016
0931f89
Do not override the property objects upon reset of connection during …
Jul 21, 2016
21ccb84
Adding testcase for 1590971
Jul 26, 2016
b741192
Merge "Do not override the property objects upon reset of connection …
Sep 29, 2016
ecb6db8
Merge "Changes reqd for node shutdown/VIP move related testcases" int…
Sep 29, 2016
bdfce4a
Merge "Wait till vm is launched before populating details from vm obj…
Sep 29, 2016
6e57ea3
Changes required in svc mirroring test code due to ECMP test code enh…
Ankitja Oct 5, 2016
134aae9
Allow testrunner to mount local cloned dirs to container
hkumarmk May 13, 2016
2ed0e06
Retry in case the vmi_back_refs aren't populated for SI
ganeshahv Oct 6, 2016
3aefe45
Deriving svc image and flavor from the specified mode
ganeshahv Oct 7, 2016
cff0757
Merge "Retry in case the vmi_back_refs aren't populated for SI" into …
Oct 13, 2016
5b793e4
Move all the externally shared testcases to contrail-test-ci repo
Aug 29, 2016
187888a
Adding None check for agent_path path
Oct 15, 2016
71bd38f
adding missing database node info in the report
msudhee Oct 18, 2016
751362b
Merge "Move all the externally shared testcases to contrail-test-ci r…
Oct 18, 2016
782cbdb
Merge "Allow testrunner to mount local cloned dirs to container" into…
Oct 19, 2016
cb71b1f
updating name and fixed ips of port not supported
aswanikumar90 Sep 14, 2016
f72b98d
Correcting a Syntax error.
pulkitt Oct 24, 2016
026d3d6
R3.0 Changing the delete_device function to take only 1 argument.
skiranh Oct 26, 2016
11a954c
Enable timeout option for sshable() method
Oct 27, 2016
692406b
Adding huge page settings if DPDK enabled
Oct 26, 2016
0ca8d0e
Adding test apis:
alokkumar223 Sep 22, 2016
2e551cc
Merge "updating name and fixed ips of port not supported" into R3.0
Oct 28, 2016
0ef872a
Remove some ubuntu images and minor bug-fixes
Oct 28, 2016
5610370
CherryPick commits from master on to R3.0
Nov 2, 2016
452595e
Merge "Adding huge page settings if DPDK enabled" into R3.0
Nov 4, 2016
5e1e20e
Merge "Adding test apis:" into R3.0
Nov 4, 2016
015fcb9
Merge "CherryPick commits from master on to R3.0" into R3.0
Nov 7, 2016
24be114
Merge "Remove some ubuntu images and minor bug-fixes" into R3.0
Nov 7, 2016
cc594ad
Merge "Enable timeout option for sshable() method" into R3.0
Nov 7, 2016
ad18412
Use different ICMP ID in scapy:
alokkumar223 Oct 27, 2016
f68d088
Correcting the svc_mode key for mirror image
ganeshahv Nov 16, 2016
787d447
correct typo in remote_cmd() method
Nov 16, 2016
8edd5c5
Adding sriov and dpdk parameter in configure.py
Nov 17, 2016
2b28a2a
Modified a function to support retries based on status checks
pulkitt Nov 17, 2016
1fe7ede
Merge "Adding sriov and dpdk parameter in configure.py" into R3.0
Nov 21, 2016
3d750ba
Merge "Correcting a Syntax error." into R3.0
Nov 22, 2016
e0efb23
Merge "Modified a function to support retries based on status checks"…
Nov 22, 2016
0abaff3
Fix broken docker build in CI
vmahuli Nov 27, 2016
4b1e2c8
Handle any prompts when remote cmds are run
Dec 2, 2016
f5b786a
Merge "correct typo in remote_cmd() method" into R3.0
Dec 5, 2016
c70c428
Support for AAP active-active mode
ganeshahv Dec 5, 2016
fd39a48
In setup_bms putting random name for netns and tap
Dec 15, 2016
3fd726a
Merge "Handle any prompts when remote cmds are run" into R3.0
Dec 16, 2016
5a31cea
Merge "In setup_bms putting random name for netns and tap" into R3.0
Dec 16, 2016
ee179a8
Download test requirement packages from cs-shared cache
vmahuli Dec 22, 2016
c910012
Refer to correct version of libpython2.7-dev and python2.7-dev
Dec 22, 2016
75ca33e
Merge "R3.0 Changing the delete_device function to take only 1 argume…
Jan 5, 2017
52aad1e
refer a different url to access images for test
vmahuli Jan 10, 2017
ea7dbe3
Add support for RBAC and add few rbac testcases shared externally
Dec 16, 2016
3756866
Merge "Add support for RBAC and add few rbac testcases shared externa…
Jan 13, 2017
5e0e9f7
Changes in Port fixture to incorporate support of secondary Instance IP
pulkitt Jan 5, 2017
b9d79ca
Merge "Changes in Port fixture to incorporate support of secondary In…
Jan 17, 2017
c12dbe4
Adding the missed self.orch
ganeshahv Jan 20, 2017
975bf5e
Flavor to be changed for vSRX
ganeshahv Jan 24, 2017
c27ae7f
Image name change
ganeshahv Jan 25, 2017
b8f24f9
Adding flavor of certain VM image types.
pulkitt Jan 30, 2017
a7f8d49
Using get_resource to get the VMI ID
ganeshahv Jan 30, 2017
529bc25
Renaming 'cirros-0.3.0-x86_64-uec' to 'cirros'
ganeshahv Dec 22, 2016
9389322
Merge "Image name change" into R3.0
Jan 31, 2017
3a23978
Merge "Flavor to be changed for vSRX" into R3.0
Jan 31, 2017
b4d3c5f
Merge "Using get_resource to get the VMI ID" into R3.0
Feb 2, 2017
7b4361e
Adding support for AAP tests.
ganeshahv Feb 4, 2017
39398ac
Import VcenterOrchestrator and set env.attr for vnc_lib_h
Feb 1, 2017
9707bb6
Merge "Adding support for AAP tests." into R3.0
Feb 7, 2017
8673502
Enhancements for aap test
sunilbasker-jnpr Feb 7, 2017
aa9a72f
Using get() for kwargs and typo correction.
ganeshahv Feb 9, 2017
0bc9921
Merge "Using get() for kwargs and typo correction." into R3.0
Feb 14, 2017
c6f078f
Replacing 'cirros-0.3.0-x86_64-uec' with 'cirros'
ganeshahv Feb 14, 2017
082ce94
fix vdns script to handle Vcenter-only with reference to bug# 1665185
nsarath Feb 17, 2017
f0b30df
Merge "Adding flavor of certain VM image types." into R3.0
Feb 20, 2017
0ce10de
VM fixture read to handle vmware vcenter-only mode
nsarath Feb 24, 2017
9eb568e
Merge "fix vdns script to handle Vcenter-only with reference to bug# …
Feb 25, 2017
d15df80
Modified scripts to support SSL in R3.0
ushamani Feb 25, 2017
021964b
Merge "Modified scripts to support SSL in R3.0" into R3.0
Feb 27, 2017
4aeaed0
1. Added library sub-routines for ecmp hash functionality.
cmallam Mar 6, 2017
5d9b1b0
transparant SVM needs the dummy virtual network
vganapath Nov 15, 2016
8af8a95
Merge "transparant SVM needs the dummy virtual network" into R3.0
Mar 11, 2017
1e9a93f
[Cherry-pick from R3.0.3.x] Adding the selenium version supported
pavanap Mar 14, 2017
d29835c
Modified script to be able to select non-default instance flavors
pavanap Mar 14, 2017
6df9d6c
[Cherry-pick] Refined instance flavor search on svc_temp page
pavanap Mar 14, 2017
abf5fce
Fix for wrong string formatting
aswanikumar90 Mar 15, 2017
de16f25
Merge "Fix for wrong string formatting" into R3.0
Mar 15, 2017
0bd2ae5
Added delete_sn
manishkn Apr 25, 2017
8a8f820
Fix dependencies for docker test container
vmahuli Apr 28, 2017
6ab8554
Merge "Added delete_sn" into R3.0
May 2, 2017
178602e
Pulling Ubuntu 16 and 14 images from svl registry
mmithun May 11, 2017
75311fc
Clean-up and tweaking of install.sh
Jun 7, 2017
e17ce21
For redhat add heat_stack_owner role to project for heat cases
aswanikumar90 Jul 19, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .gitreview
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
#
# OpenContrail Code Review System
#
# Please visit opencontrail.org additional information.
#
# e.g. After changes are complete and commited to a local branch, do
# 'git review' to submit changeset to review.opencontrail.org Code Review
# (gerrit) System.
#
[gerrit]
host=review.opencontrail.org
port=29418
project=Juniper/contrail-test-ci.git
defaultbranch=R3.0
28 changes: 16 additions & 12 deletions common/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def __init__(self, inputs=None, logger=None, project_name=None,
self.agent_inspect = custom_dict(self.get_vrouter_agent_inspect_handle,
'agent_inspect')
self.ops_inspects = custom_dict(self.get_opserver_inspect_handle,
'ops_inspect')
'ops_inspect:'+self.project_name+':'+self.username)
self.cn_inspect = custom_dict(self.get_control_node_inspect_handle,
'cn_inspect')
self.ds_inspect = custom_dict(self.get_discovery_service_inspect_handle,
Expand All @@ -48,8 +48,8 @@ def __init__(self, inputs=None, logger=None, project_name=None,
# ToDo: msenthil/sandipd rest of init needs to be better handled
self.auth = self.get_auth_h()
self.vnc_lib = self.get_vnc_lib_h()
self.project_id = self.get_project_id()
if self.inputs.orchestrator == 'openstack':
self.project_id = self.get_project_id()
if self.inputs.verify_thru_gui():
self.ui_login = UILogin(self, self.inputs, project_name, username, password)
self.browser = self.ui_login.browser
Expand Down Expand Up @@ -97,22 +97,27 @@ def get_auth_h(self, refresh=False, project_name=None,
return env[attr]

def get_vnc_lib_h(self, refresh=False):
attr = '_vnc_lib_' + self.project_name + '_' + self.username
attr = '_vnc_lib_fixture_' + self.project_name + '_' + self.username
cfgm_ip = self.inputs.api_server_ip or \
self.inputs.contrail_external_vip or self.inputs.cfgm_ip
if not getattr(env, attr, None) or refresh:
self.vnc_lib_fixture = VncLibFixture(
env[attr] = VncLibFixture(
username=self.username, password=self.password,
domain=self.domain_name, project_name=self.project_name,
inputs = self.inputs,
inputs=self.inputs,
cfgm_ip=cfgm_ip,
api_server_port=self.inputs.api_server_port,
auth_server_ip=self.inputs.auth_ip,
orchestrator=self.inputs.orchestrator,
project_id=self.get_project_id(),
certfile = self.inputs.keystonecertfile,
keyfile = self.inputs.keystonekeyfile,
cacert = self.inputs.keycertbundle,
insecure = self.inputs.insecure,
logger=self.logger)
self.vnc_lib_fixture.setUp()
self.vnc_lib = self.vnc_lib_fixture.get_handle()
env[attr].setUp()
self.vnc_lib_fixture = env[attr]
self.vnc_lib = self.vnc_lib_fixture.get_handle()
return self.vnc_lib

def get_api_inspect_handle(self, host):
Expand All @@ -122,6 +127,7 @@ def get_api_inspect_handle(self, host):
if host not in self.api_server_inspects:
self.api_server_inspects[host] = VNCApiInspect(host,
inputs=self.inputs,
protocol=self.inputs.api_protocol,
logger=self.logger)
return self.api_server_inspects[host]

Expand Down Expand Up @@ -156,7 +162,8 @@ def get_opserver_inspect_handle(self, host):
if ip not in self.ops_inspects:
self.ops_inspects[ip] = VerificationOpsSrv(ip,
port=self.inputs.analytics_api_port,
logger=self.logger)
logger=self.logger,
inputs=self.inputs)
return self.ops_inspects[ip]

def get_discovery_service_inspect_handle(self, host):
Expand Down Expand Up @@ -215,7 +222,7 @@ def ds_verification_obj(self):
if not getattr(self, '_ds_verification_obj', None):
self._ds_verification_obj = DiscoveryVerification(self.inputs,
self.cn_inspect, self.agent_inspect,
self.ops_inspects, self.ds_inspect,
self.ops_inspects, self.ds_inspect, self.vnc_lib,
logger=self.logger)
return self._ds_verification_obj
@ds_verification_obj.setter
Expand All @@ -229,9 +236,6 @@ def update_inspect_handles(self):
self.agent_inspect.clear()
self.ops_inspects.clear()
self.ds_inspect.clear()
self.api_server_inspect = None
self.ops_inspect = None
self.ds_verification_obj = None
self._svc_mon_inspect = None
self._api_server_inspect = None
self._ops_inspect = None
Expand Down
78 changes: 68 additions & 10 deletions common/contrail_test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from netaddr import *

import fixtures
from fabric.api import env, run, local
from fabric.api import env, run, local, sudo
from fabric.operations import get, put, reboot
from fabric.context_managers import settings, hide
from fabric.exceptions import NetworkError
Expand All @@ -28,6 +28,7 @@
import subprocess
import ast
from collections import namedtuple
from cfgm_common import utils

# monkey patch subprocess.check_output cos its not supported in 2.6
if "check_output" not in dir(subprocess): # duck punch it in!
Expand Down Expand Up @@ -61,6 +62,7 @@ def __init__(self, ini_file=None):
self.jenkins_trigger = self.get_os_env('JENKINS_TRIGGERED')
self.os_type = custom_dict(self.get_os_version, 'os_type')
self.config = None
self.ini_file = ini_file
if ini_file:
self.config = ConfigParser.ConfigParser()
self.config.read(ini_file)
Expand All @@ -85,15 +87,15 @@ def __init__(self, ini_file=None):
self.admin_username = read_config_option(self.config,
'Basic',
'adminUser',
os.getenv('OS_USERNAME', None))
os.getenv('OS_USERNAME', 'admin'))
self.admin_password = read_config_option(self.config,
'Basic',
'adminPassword',
os.getenv('OS_PASSWORD', None))
os.getenv('OS_PASSWORD', 'contrail123'))
self.admin_tenant = read_config_option(self.config,
'Basic',
'adminTenant',
os.getenv('OS_TENANT_NAME', None))
os.getenv('OS_TENANT_NAME', 'admin'))

self.stack_user = read_config_option(
self.config,
Expand All @@ -120,7 +122,16 @@ def __init__(self, ini_file=None):
'Basic',
'stackRegion',
os.getenv('OS_REGION_NAME', 'RegionOne'))

self.neutron_username = read_config_option(
self.config,
'Basic',
'neutron_username',
None)
self.availability_zone = read_config_option(
self.config,
'Basic',
'availability_zone',
None)
self.endpoint_type = read_config_option(
self.config,
'Basic',
Expand All @@ -132,6 +143,10 @@ def __init__(self, ini_file=None):
'Basic', 'auth_port', 5000)
self.auth_protocol = read_config_option(self.config,
'Basic', 'auth_protocol', 'http')
self.api_protocol = read_config_option(self.config,
'cfgm', 'api_protocol', 'http')
self.api_insecure = read_config_option(self.config,
'cfgm', 'api_insecure_flag', True)
self.ds_port = read_config_option(self.config, 'services',
'discovery_port', '5998')
self.api_server_port = read_config_option(self.config, 'services',
Expand Down Expand Up @@ -163,6 +178,8 @@ def __init__(self, ini_file=None):
'Basic', 'multiTenancy', False)
self.enable_ceilometer = read_config_option(self.config,
'Basic', 'enable_ceilometer', False)
self.ci_flavor = read_config_option(self.config,
'Basic', 'ci_flavor', None)
self.fixture_cleanup = read_config_option(
self.config,
'Basic',
Expand Down Expand Up @@ -250,6 +267,7 @@ def __init__(self, ini_file=None):
self.ha_tmp_list = []
self.tor_agent_data = {}
self.sriov_data = {}
self.dpdk_data = {}
self.mysql_token = None

self.public_host = read_config_option(self.config, 'Basic',
Expand Down Expand Up @@ -311,6 +329,34 @@ def __init__(self, ini_file=None):
'supervisor-analytics',
'contrail-snmp-collector', 'contrail-topology']
self.correct_states = ['active', 'backup']
self.apicertfile = read_config_option(self.config,
'cfgm', 'api_certfile', None)
self.apikeyfile = read_config_option(self.config,
'cfgm', 'api_keyfile', None)
self.apicafile = read_config_option(self.config,
'cfgm', 'api_cafile', None)
self.keystonecertfile = read_config_option(self.config,
'Basic', 'keystone_certfile', None)
self.keystonekeyfile = read_config_option(self.config,
'Basic', 'keystone_keyfile', None)
self.keystonecafile = read_config_option(self.config,
'Basic', 'keystone_cafile', None)
self.insecure = os.getenv('OS_INSECURE')
if self.insecure:
self.insecure = bool(self.insecure)
else:
self.insecure = read_config_option(self.config,
'Basic', 'keystone_insecure_flag', True)
if self.auth_url.startswith('https') and not self.insecure:
self.keystone_bundle = '/tmp/' + get_random_string() + '.pem'
if self.keystonecertfile and self.keystonekeyfile and \
self.keystonecafile:
self.certs = [self.keystonecertfile, self.keystonekeyfile,
self.keystonecafile]
self.keycertbundle = utils.getCertKeyCaBundle(self.keystone_bundle,
self.certs)
else:
self.keycertbundle = None

def get_os_env(self, var, default=''):
if var in os.environ:
Expand Down Expand Up @@ -374,6 +420,7 @@ def read_prov_file(self):
self.ds_server_name = []
self.host_ips = []
self.webui_ips = []
self.webui_control_ips = []
self.host_data = {}
self.tor = {}
self.tor_hosts_data = {}
Expand Down Expand Up @@ -421,6 +468,7 @@ def read_prov_file(self):
if role['type'] == 'webui':
self.webui_ip = host_ip
self.webui_ips.append(host_ip)
self.webui_control_ips.append(host_control_ip)
if role['type'] == 'collector':
self.collector_ip = host_ip
self.collector_ips.append(host_ip)
Expand All @@ -437,11 +485,17 @@ def read_prov_file(self):
if 'vgw' in json_data:
self.vgw_data = json_data['vgw']

if 'xmpp_auth_enable' in json_data:
self.xmpp_auth_enable = json_data['xmpp_auth_enable']
if 'xmpp_dns_auth_enable' in json_data:
self.xmpp_dns_auth_enable = json_data['xmpp_dns_auth_enable']

if 'tor_agent' in json_data:
self.tor_agent_data = json_data['tor_agent']
if 'sriov' in json_data:
self.sriov_data = json_data['sriov']

if 'dpdk' in json_data:
self.dpdk_data = json_data['dpdk']
if 'tor_hosts' in json_data:
self.tor_hosts_data = json_data['tor_hosts']

Expand Down Expand Up @@ -506,6 +560,7 @@ def get_computes(self, cfgm_ip):
'project_name': self.stack_tenant,
'auth_ip': self.auth_ip,
'auth_port': self.auth_port,
'auth_protocol': self.auth_protocol,
'api_server_port': self.api_server_port,
}
api_h = VNCApiInspect(cfgm_ip, inputs=type('', (), kwargs))
Expand Down Expand Up @@ -534,13 +589,15 @@ def _create_prov_file(self):
if self.orchestrator.lower() == 'openstack':
auth_url = os.getenv('OS_AUTH_URL', None) or \
'http://127.0.0.1:5000/v2.0'
insecure = bool(os.getenv('OS_INSECURE', True))
keystone = KeystoneCommands(self.stack_user,
self.stack_password,
self.stack_tenant,
auth_url,
region_name=self.region_name,
insecure=insecure)
insecure=self.insecure,
cert=self.keystone_certfile,
key=self.keystone_keyfile,
cacert=self.keycertbundle)
match = re.match(pattern, keystone.get_endpoint('identity')[0])
self.auth_ip = match.group('ip')
self.auth_port = match.group('port')
Expand Down Expand Up @@ -631,7 +688,7 @@ def run_cmd_on_server(self, server_ip, issue_cmd, username=None,
with settings(
host_string='%s@%s' % (username, server_ip), password=password,
warn_only=True, abort_on_prompts=False):
output = run('%s' % (issue_cmd), pty=pty)
output = sudo('%s' % (issue_cmd), pty=pty)
return output
# end run_cmd_on_server

Expand Down Expand Up @@ -660,6 +717,7 @@ def __init__(
# address_family = read_config_option(self.config,
# 'Basic', 'AddressFamily', 'dual')
self.address_family = 'v4'
self.use_admin_auth = False
# end __init__

def set_af(self, af):
Expand Down Expand Up @@ -767,7 +825,7 @@ def verify_service_state(self, host, service, username, password):

def verify_control_connection(self, connections):
discovery = connections.ds_verification_obj
return discovery.verify_bgp_connection()
return discovery._verify_bgp_connection()
# end verify_control_connection

def build_compute_to_control_xmpp_connection_dict(self, connections):
Expand Down
4 changes: 2 additions & 2 deletions common/device_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def disconnect(self):
def show_version(self):
return self.handle.show_version()

def config(self, stmts=[], commit=True, ignore_errors=False):
def config(self, stmts=[], commit=True, ignore_errors=False, timeout = 30):
for stmt in stmts:
try:
self.config_handle.load(stmt, format='set', merge=True)
Expand All @@ -114,7 +114,7 @@ def config(self, stmts=[], commit=True, ignore_errors=False):
raise e
if commit:
try:
self.config_handle.commit()
self.config_handle.commit(timeout = timeout)
except CommitError,e:
self.logger.exception(e)
return (False,e)
Expand Down
2 changes: 1 addition & 1 deletion common/ecmp/ecmp_test_resource.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def setup_common_objects(self):

# Get the project_fixture
self.project_fixture = self.useFixture(ProjectFixture(
vnc_lib_h=self.vnc_lib, project_name=self.inputs.project_name, connections=self.connections))
project_name=self.inputs.project_name, connections=self.connections))
# Read the project obj and set to the floating ip object.
self.fip_obj.set_project(self.project_fixture.project_obj)

Expand Down
Loading