API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 13th, 2017
116
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.28 KB | None | 0 0
raw download clone embed print report
  1. kklimonda@zuulv3:/var/lib/zuul/git/review.opencontrail.org/Juniper/contrail-controller$ ls
  2. kklimonda@zuulv3:/var/log/zuul$ cd^C lib LICENSE README.md SConscript specs src styleguide.rst
  3. kklimonda@zuulv3:/var/log/zuul$ cd /tmp/contrail-controller/
  4. kklimonda@zuulv3:/tmp/contrail-controller$ git reset --hard 64ad76f03262fa26a33098c636806a2559c95374
  5. HEAD is now at 64ad76f Merge "Build boost for windows"
  6. kklimonda@zuulv3:/tmp/contrail-controller$ git merge -s resolve FETCH_HEAD
  7. Trying really trivial in-index merge...
  8. error: Merge requires file-level merging
  9. Nope.
  10. Trying simple merge.
  11. Merge made by the 'resolve' strategy.
  12. src/config/api-server/.coveragerc | 14 +++++--------
  13. src/config/api-server/.pylintrc | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  14. src/config/api-server/.testr.conf | 7 +------
  15. src/config/api-server/MANIFEST.in | 7 +++++--
  16. src/config/api-server/README.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  17. src/config/api-server/SConscript | 69 +++++++++++++++++++++----------------------------------------
  18. src/config/api-server/__init__.py | 9 --------
  19. src/config/api-server/discovery_client_stats.sandesh | 61 ------------------------------------------------------
  20. src/config/api-server/run_tests.sh | 8 -------
  21. src/config/api-server/setup.cfg | 38 ++++++++++++++++++++++++++++++++++
  22. src/config/api-server/setup.py | 88 ++++++++++++++++++++++++++++++++++++++++++-----------------------------------
  23. src/config/api-server/test-requirements.txt | 2 --
  24. src/config/api-server/tests/fab_tasks.py | 115 -----------------------------------------------------------------------------------------------------
  25. src/config/api-server/tox.ini | 48 ++++++++++++++++++++++++++++++++++++++++++
  26. src/config/api-server/{tests => vnc_cfg_api_server}/__init__.py | 0
  27. src/config/api-server/{ => vnc_cfg_api_server}/auth_context.py | 0
  28. src/config/api-server/{ => vnc_cfg_api_server}/context.py | 0
  29. src/config/api-server/{ => vnc_cfg_api_server}/db_manage.py | 0
  30. src/config/api-server/{ => vnc_cfg_api_server}/provision_defaults.py | 0
  31. src/config/api-server/{README.txt => vnc_cfg_api_server/tests/__init__.py} | 0
  32. src/config/api-server/{ => vnc_cfg_api_server}/tests/fake_api_server.py | 0
  33. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_addr_mgmt.py | 0
  34. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_askip.py | 0
  35. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_case.py | 0
  36. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_crud_basic.py | 5 +++--
  37. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_e2.py | 0
  38. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_fc_id.py | 0
  39. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_firewall.py | 0
  40. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_instance_ctl.py | 0
  41. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_ip_alloc.py | 8 ++++---
  42. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_kombu.py | 10 +--------
  43. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_logical_router.py | 0
  44. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_perms.py | 0
  45. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_perms2.py | 0
  46. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_perms2_target.py | 0
  47. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_physical_interface.py | 0
  48. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_quota.py | 0
  49. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_rbac.py | 0
  50. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_rdbms.py | 0
  51. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_security_group.py | 0
  52. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_subnet_ip_count.py | 0
  53. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_subnet_ip_count_with_ui.py | 0
  54. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_tag.py | 0
  55. src/config/api-server/{ => vnc_cfg_api_server}/tests/test_virtual_network.py | 0
  56. src/config/api-server/{ => vnc_cfg_api_server}/utils.py | 0
  57. src/config/api-server/{ => vnc_cfg_api_server}/vnc_addr_mgmt.py | 12 +++++------
  58. src/config/api-server/{ => vnc_cfg_api_server}/vnc_auth.py | 0
  59. src/config/api-server/{ => vnc_cfg_api_server}/vnc_auth_keystone.py | 0
  60. src/config/api-server/{ => vnc_cfg_api_server}/vnc_bottle.py | 0
  61. src/config/api-server/{ => vnc_cfg_api_server}/vnc_cfg_api_server.py | 0
  62. src/config/api-server/{ => vnc_cfg_api_server}/vnc_cfg_types.py | 0
  63. src/config/api-server/{ => vnc_cfg_api_server}/vnc_db.py | 0
  64. src/config/api-server/{ => vnc_cfg_api_server}/vnc_perms.py | 0
  65. src/config/api-server/{ => vnc_cfg_api_server}/vnc_quota.py | 0
  66. src/config/api-server/{ => vnc_cfg_api_server}/vnc_rbac.py | 0
  67. src/config/api-server/{ => vnc_cfg_api_server}/vnc_rdbms.py | 0
  68. src/config/common/tests/test_common.py | 2 +-
  69. src/config/contrail_issu/SConscript | 2 +-
  70. src/config/contrail_issu/test-requirements.txt | 2 +-
  71. src/config/device-manager/SConscript | 2 +-
  72. src/config/device-manager/test-requirements.txt | 2 +-
  73. src/config/schema-transformer/SConscript | 8 +++----
  74. src/config/schema-transformer/test-requirements.txt | 2 +-
  75. src/config/schema-transformer/test/fab_tasks.py | 2 +-
  76. src/config/svc-monitor/SConscript | 2 +-
  77. src/config/svc-monitor/test-requirements.txt | 2 +-
  78. src/config/test/SConscript | 9 +++-----
  79. src/config/vnc_openstack/SConscript | 2 +-
  80. src/config/vnc_openstack/test-requirements.txt | 2 +-
  81. src/container/cni/SConscript | 3 +--
  82. src/container/cni/test-requirements.txt | 1 -
  83. src/container/kube-cni/SConscript | 3 +--
  84. src/container/kube-cni/test-requirements.txt | 1 -
  85. src/container/kube-manager/SConscript | 2 +-
  86. src/container/kube-manager/test-requirements.txt | 2 +-
  87. src/container/mesos-manager/SConscript | 2 +-
  88. src/container/mesos-manager/test-requirements.txt | 2 +-
  89. 77 files changed, 415 insertions(+), 349 deletions(-)
  90. create mode 100644 src/config/api-server/.pylintrc
  91. create mode 100644 src/config/api-server/README.md
  92. delete mode 100644 src/config/api-server/__init__.py
  93. delete mode 100644 src/config/api-server/discovery_client_stats.sandesh
  94. delete mode 100755 src/config/api-server/run_tests.sh
  95. create mode 100644 src/config/api-server/setup.cfg
  96. delete mode 100644 src/config/api-server/tests/fab_tasks.py
  97. create mode 100644 src/config/api-server/tox.ini
  98. rename src/config/api-server/{tests => vnc_cfg_api_server}/__init__.py (100%)
  99. rename src/config/api-server/{ => vnc_cfg_api_server}/auth_context.py (100%)
  100. rename src/config/api-server/{ => vnc_cfg_api_server}/context.py (100%)
  101. rename src/config/api-server/{ => vnc_cfg_api_server}/db_manage.py (100%)
  102. rename src/config/api-server/{ => vnc_cfg_api_server}/provision_defaults.py (100%)
  103. rename src/config/api-server/{README.txt => vnc_cfg_api_server/tests/__init__.py} (100%)
  104. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/fake_api_server.py (100%)
  105. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_addr_mgmt.py (100%)
  106. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_askip.py (100%)
  107. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_case.py (100%)
  108. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_crud_basic.py (99%)
  109. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_e2.py (100%)
  110. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_fc_id.py (100%)
  111. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_firewall.py (100%)
  112. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_instance_ctl.py (100%)
  113. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_ip_alloc.py (99%)
  114. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_kombu.py (93%)
  115. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_logical_router.py (100%)
  116. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_perms.py (100%)
  117. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_perms2.py (100%)
  118. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_perms2_target.py (100%)
  119. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_physical_interface.py (100%)
  120. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_quota.py (100%)
  121. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_rbac.py (100%)
  122. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_rdbms.py (100%)
  123. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_security_group.py (100%)
  124. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_subnet_ip_count.py (100%)
  125. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_subnet_ip_count_with_ui.py (100%)
  126. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_tag.py (100%)
  127. rename src/config/api-server/{ => vnc_cfg_api_server}/tests/test_virtual_network.py (100%)
  128. rename src/config/api-server/{ => vnc_cfg_api_server}/utils.py (100%)
  129. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_addr_mgmt.py (99%)
  130. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_auth.py (100%)
  131. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_auth_keystone.py (100%)
  132. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_bottle.py (100%)
  133. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_cfg_api_server.py (100%)
  134. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_cfg_types.py (100%)
  135. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_db.py (100%)
  136. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_perms.py (100%)
  137. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_quota.py (100%)
  138. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_rbac.py (100%)
  139. rename src/config/api-server/{ => vnc_cfg_api_server}/vnc_rdbms.py (100%)
  140. kklimonda@zuulv3:/tmp/contrail-controller$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!