Skip to content

Merging base#7

Open
Shivayogi123 wants to merge 189 commits intoJuniper:merging_basefrom
Shivayogi123:merging_base
Open

Merging base#7
Shivayogi123 wants to merge 189 commits intoJuniper:merging_basefrom
Shivayogi123:merging_base

Conversation

@Shivayogi123
Copy link
Copy Markdown
Contributor

No description provided.

pedro-r-marques and others added 30 commits September 3, 2013 10:23
… loop at _request_server method to recover when connection successful and retries until then
Conflicts:
	src/api-lib/SConscript
	src/config/api-server/SConscript
	src/config/common/SConscript
	src/config/schema-transformer/SConscript
	src/config/svc-monitor/SConscript
	src/config/vnc_openstack/SConscript
	src/control-node/SConscript
	src/discovery/SConscript
	src/discovery/client/SConscript
	src/opserver/SConscript
	src/opserver/test/utils/analytics_fixture.py
	src/sandesh/common/SConscript
	src/vnsw/agent/cfg/cfg_mirror.cc
	src/vnsw/agent/pkt/flow_table.h
	src/vnsw/agent/pkt/test/test_pkt_flow.cc
…keystone (_authenticate()) is done in try catch. In case of exception, give an error message “unable to authenticate”

2. If auth token is specified, and authentication fails, no attempt should be made to fetch token again. Instead return error.
3. Authentication protocol is made configurable(key stone access may be secured(https) or unsecured(http))
This commit provides atomic ref update so that multiple api server updating the same ref list can update it without overwriting each other's changes.
We are creating a new POST API 'ref-update' that can be used to update an individual reference. An accompanying change in generateDS.py is required.
Change-Id: If268ab5ed6a0b9dd22e49d1b58b5c78191c07fae
Change-Id: I76bca7539ce11a9b6862cc5264688a83389457fc
… token is specified while invoking VncApi

Change-Id: I8e876d48e1da5410a4c52e7fd944584a886100ac
…cate if token is specified while invoking VncApi"
Change-Id: I902d03f63e52eced193fd6ee1f03d8f52d454e2c
… authentication.

Otherwise an exception during authentication will wedge for future requests(self._retry_after_authn never reset to false).

Change-Id: I441836a400843f41da1c1adcc8700cdd79a85366
(cherry picked from commit 968c2388d3d196c30c0c609a5fb464eaac22e456)
…hon setup.py run_tests

Change-Id: I18151c3f7c36c622dc3828c89683c4ae35b0bc95
Sundaresan Rajangam and others added 18 commits November 10, 2017 11:00
1) user_token was referenced before initialization causing analytics-api to
throw exception.

2) Fix the issue in vnc-api that if an invalid/expired user-token is passed,
   then it shouldn't retry with the admin user token.

Change-Id: I8ce47116f6421ee33971ea4e5fdd23f2ed5c408a
Closes-Bug: #1731182
VNC API is much dependent on the config common code right now. Also we are
hard coding the version of the generated package. Which makes the package
static and dependent on other code. Hence, to upload to pip as a package,
we need to make it independent of the other modules and also automate the
versioning of the package.

Fixed all pep8 errors in vnc_api module

Change-Id: Idc914c445d9ef18d4c2e2313298bf2c4075375fc
Partial-Bug: #1711447
Change-Id: Ifda10e24422e424c1e37f6cca73fb8d8d13a624f
Closes-Bug: #1740435
Since set_auth_token() does not set _auth_token_input,
the recursive call happens with other available credentials
which breaks the rbac.
Setting _auth_token_input True in set_auth_token() stops the
recursive call.

Change-Id: I6b16b98e9ad4d532bc0ea09d336ab8850ddb93af
Partial-bug: #1650420
Replace copy/paste of "python setup.py run_tests" with calls to new
methods added to our scons rules.

Main objective is to recover ability to set BUILD_ONLY, but this also
consolidates our (mis)use of "python setup.py run_tests"

Note that there are still some direct Command() calls that use "python
setup.py run_tests" that need to be revisited

Change-Id: I8fadd9c896422ed5e107aa7abad7af68353e7620
Partial-Bug: #1685303
Partial-Bug: #1749337
Depends-On: I0296db6956a59ce032bf01d41dcb88ac2d54da18
Change-Id: I55d79a3ace7ff59e7dc00adb9e886cf2919d536c
Merging basePulling in latest changes.
Change-Id: I1d6e65e4d6c1e7dccddc32d290817fa545dad363
As part of adding support for inter AS Option C, there is a need to be able to
mainipulate the tunnel encapsulation.
BGP Schema changes are made to configure the Default Tunnel Encapsulation List
per address family, per peer. Note, that this list is not expected to be
configured for non-VPN address families including labeled inet (earlier commit
for supporting this feature). Support for the labeled inet family would require
a minor change, i.e., not blindly strip communities as it does now.
Added 'mpls' as an encapsulation supported in the unicast XMPP schema, have NOT
done the same for the multicast and Ethernet XMPP schemas at this time.
Note that currently any string can be sent on the wire, so this appears to be
for documentation only,  however is not up to date.
Partial-Bug: #1743517
Change-Id: I315b7290acbb72adea98546fb821ea4f738dd0be
For the security draft mode, new property was added to mark a security
as deleted. As that property is system only, that patch limit CRUD to
read only.

Change-Id: I618df58a6f0a9f8cd02e68a4241b3d3a045ba286
Partial-Bug: #1742774
Partial-Bug: #1753570
Depends-On: I9bdca80e7497c31fa8e58a52f50b73516657e9de
Change-Id: I7dd87938eac6634e5d93ee43730ef26c49cd161a
Adds the config code to support Security draft mode [1].

[1] https://github.com/Juniper/contrail-specs/blob/master/security_draft_mode.md
[2] https://blueprints.launchpad.net/juniperopenstack/+spec/security-draft-mode

Partially-Implements: blueprint security-draft-mode [2]
Partial-Bug: #1742774
Depends-on: I618df58a6f0a9f8cd02e68a4241b3d3a045ba286
Change-Id: Iceb46ac2babb6f5d319f5b9bcc5c2050684de39c
…1753570 Depends-On: I9bdca80e7497c31fa8e58a52f50b73516657e9de Change-Id: I7dd87938eac6634e5d93ee43730ef26c49cd161a"
@Shivayogi123
Copy link
Copy Markdown
Contributor Author

bringing in api-lib

@Shivayogi123
Copy link
Copy Markdown
Contributor Author

Bringing in api-lib

Shivayogi123 and others added 5 commits March 16, 2018 15:00
move api-lib from controller repo to contrail-api-client repo.
when using vnc_api library with
list of api-servers as the input.

Change-Id: Ie5e676f72bbe62f0bf53ea672e366ed13441c9f5
Closes-Bug: 1749298
@Shivayogi123
Copy link
Copy Markdown
Contributor Author

sync latest commits of api lib from controller repo to api lib of contrail-api-contrail repo.

@Shivayogi123
Copy link
Copy Markdown
Contributor Author

sync latest commits of api lib from controller repo to api lib of contrail-api-contrail repo.

1 similar comment
@Shivayogi123
Copy link
Copy Markdown
Contributor Author

sync latest commits of api lib from controller repo to api lib of contrail-api-contrail repo.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.