Skip to content

Commit

Permalink
Revert "cloudvision: Mirror arista and fmp with cloudvision prefix"
Browse files Browse the repository at this point in the history
This reverts commit 85d266e.

Reason for revert: Loading of `cloudvision.arista|fmp` files and same proto of existing files will cause python exceptions due to the grpc fields using the same field number, e.g. "Extensions "fmp.model" and "cloudvision.fmp.model" both try to extend message type "google.protobuf.MessageOptions" with field number 51423". This will cause issues in existing infra outside standalone scripts.

Change-Id: Idee03b035f9765737b3107e4576b50865ffa5c19
  • Loading branch information
cianmcgrath committed Dec 12, 2024
1 parent 85d266e commit aefe7bc
Show file tree
Hide file tree
Showing 190 changed files with 2 additions and 59,967 deletions.
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@ dist:
dev-setup:
pip3 install .[dev]

# Including cloudvision/arista in the general check causes mypy to mark cvlib as problematic.
# mypy thinks that context.py's import of `from time import process_time_ns` is for some reason
# pointing to cloudvision/arista/time and so flags an issue as the following:
# `cloudvision/cvlib/context.py:10: error: Module "time" has no attribute "process_time_ns"`
# The mypy check passes fine if both are checked in isolation though
lint:
flake8 .
mypy --exclude cloudvision/arista --exclude build --exclude .venv .
mypy cloudvision/arista
mypy --exclude build --exclude .venv .
./check_copyright.sh
2 changes: 1 addition & 1 deletion check_copyright.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ notice='Copyright \(c\) 20[0-9][0-9] Arista Networks, Inc.'
apacheNotice='Use of this source code is governed by the Apache License 2.0'
apacheNoticeSource='that can be found in the COPYING file.'
confidential='Confidential and Proprietary'
generatedCodePaths='(^arista|^fmp|^cloudvision/arista|^cloudvision/fmp).*'
generatedCodePaths='(^arista|^fmp).*'
copyrightCheck='.*(check_copyright.sh)'

files=`git diff-tree --no-commit-id --name-only --diff-filter=ACMR -r HEAD | \
Expand Down
1 change: 0 additions & 1 deletion cloudvision/arista/alert/__init__.py

This file was deleted.

4 changes: 0 additions & 4 deletions cloudvision/arista/alert/v1/__init__.py

This file was deleted.

220 changes: 0 additions & 220 deletions cloudvision/arista/alert/v1/alert_pb2.py

This file was deleted.

2,781 changes: 0 additions & 2,781 deletions cloudvision/arista/alert/v1/alert_pb2.pyi

This file was deleted.

4 changes: 0 additions & 4 deletions cloudvision/arista/alert/v1/alert_pb2_grpc.py

This file was deleted.

6 changes: 0 additions & 6 deletions cloudvision/arista/alert/v1/services/__init__.py

This file was deleted.

113 changes: 0 additions & 113 deletions cloudvision/arista/alert/v1/services/gen_pb2.py

This file was deleted.

950 changes: 0 additions & 950 deletions cloudvision/arista/alert/v1/services/gen_pb2.pyi

This file was deleted.

1,107 changes: 0 additions & 1,107 deletions cloudvision/arista/alert/v1/services/gen_pb2_grpc.py

This file was deleted.

1 change: 0 additions & 1 deletion cloudvision/arista/bugexposure/__init__.py

This file was deleted.

4 changes: 0 additions & 4 deletions cloudvision/arista/bugexposure/v1/__init__.py

This file was deleted.

40 changes: 0 additions & 40 deletions cloudvision/arista/bugexposure/v1/bugexposure_pb2.py

This file was deleted.

184 changes: 0 additions & 184 deletions cloudvision/arista/bugexposure/v1/bugexposure_pb2.pyi

This file was deleted.

4 changes: 0 additions & 4 deletions cloudvision/arista/bugexposure/v1/bugexposure_pb2_grpc.py

This file was deleted.

6 changes: 0 additions & 6 deletions cloudvision/arista/bugexposure/v1/services/__init__.py

This file was deleted.

42 changes: 0 additions & 42 deletions cloudvision/arista/bugexposure/v1/services/gen_pb2.py

This file was deleted.

Loading

0 comments on commit aefe7bc

Please sign in to comment.