Diagram class related to #127 #135
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
October 20, 2024 22:04
juztas
requested changes
Oct 21, 2024
There was a problem hiding this comment.
Please run pylint on your python code and fix issues.
************* Module test
test.py:1:0: C0114: Missing module docstring (missing-module-docstring)
test.py:12:0: C0115: Missing class docstring (missing-class-docstring)
test.py:60:12: W0106: Expression "val1['obj'] >> Edge(label=self.d_LinkLabel(val1, val2)) << val2['obj']" is assigned to nothing (expression-not-assigned)
test.py:69:35: R1733: Unnecessary dictionary index lookup, use 'vals' instead (unnecessary-dict-index-lookup)
test.py:74:39: R1733: Unnecessary dictionary index lookup, use 'vals' instead (unnecessary-dict-index-lookup)
test.py:79:39: R1733: Unnecessary dictionary index lookup, use 'vals' instead (unnecessary-dict-index-lookup)
test.py:81:4: C0116: Missing function or method docstring (missing-function-docstring)
test.py:94:4: C0116: Missing function or method docstring (missing-function-docstring)
test.py:94:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
test.py:108:4: C0116: Missing function or method docstring (missing-function-docstring)
test.py:108:4: R1710: Either all return statements in a function should return an expression, or none of them should. (inconsistent-return-statements)
test.py:117:4: C0116: Missing function or method docstring (missing-function-docstring)
test.py:125:4: C0116: Missing function or method docstring (missing-function-docstring)
test.py:126:38: C0121: Comparison 'self.popreverse == None' should be 'self.popreverse is None' (singleton-comparison)
test.py:128:40: C0121: Comparison 'self.popreverse == False' should be 'self.popreverse is False' if checking for the singleton value False, or 'not self.popreverse' if testing for falsiness (singleton-comparison)
test.py:130:40: C0121: Comparison 'self.popreverse == True' should be 'self.popreverse is True' if checking for the singleton value True, or 'bool(self.popreverse)' if testing for truthiness (singleton-comparison)
test.py:133:4: C0116: Missing function or method docstring (missing-function-docstring)
test.py:140:19: R1714: Consider merging these comparisons with 'in' by using 'self.popreverse in (None, False)'. Use a set instead if elements are hashable. (consider-using-in)
test.py:140:19: C0121: Comparison 'self.popreverse == None' should be 'self.popreverse is None' (singleton-comparison)
test.py:140:46: C0121: Comparison 'self.popreverse == False' should be 'self.popreverse is False' if checking for the singleton value False, or 'not self.popreverse' if testing for falsiness (singleton-comparison)
test.py:142:21: C0121: Comparison 'self.popreverse == True' should be 'self.popreverse is True' if checking for the singleton value True, or 'self.popreverse' if testing for truthiness (singleton-comparison)
------------------------------------------------------------------
Your code has been rated at 8.26/10 (previous run: 6.03/10, +2.23)
for rcfile - use this one: https://github.com/sdn-sense/siterm/blob/master/standarts/pylintrc (We should also upload rcfile to this repo too)
added 2 commits
October 21, 2024 18:49
|
Looks all good, one thing which is still missing is: You can see mermaid example here: https://autogole-grafana.nrp-nautilus.io/d/3634ecaa-6a1b-55d5-6464-292f22be058e/sc23-rucio-dmm-fnal-ucsd-flow-c33a01c3-e94f-4d4f-be7f-97bb1114bf10-2024-10-02-01-16-35-justas-dev?orgId=1 So it needs to include BGP information also to diagrams diagram. |
|
@juztas I added the BGP |
|
I see no bgp added |
juztas
reviewed
Nov 8, 2024
| #Generate Diagrams | ||
| try: | ||
| diagram_filename = f"{self.config.get('image_dir', '/srv/images')}/diagram_{kwargs['referenceUUID']}" | ||
| DiagramWorker(self.orderlist).createGraph(diagram_filename) |
There was a problem hiding this comment.
We should use class inheritance, same as we do for templates and other classes.
|
Idk what happened (base) sunami@Sunamis-MacBook-Pro packaging % git status
On branch imageserver
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: files/etc/grid-security/hostcert.pem
modified: files/etc/grid-security/hostkey.pem
modified: files/etc/rtmon.yaml
modified: files/etc/sense-o-auth.yaml
modified: start-dev.sh
modified: ../src/python/RTMonLibs/DiagramWorker.py
modified: ../src/python/RTMonLibs/imageserver.py
Untracked files:
(use "git add <file>..." to include in what will be committed)
diagram.png
diagram2.png
../src/python/RTMonLibs/__pycache__/
no changes added to commit (use "git add" and/or "git commit -a")
(base) sunami@Sunamis-MacBook-Pro packaging % git add ../src/python/RTMonLibs/DiagramWorker.py
(base) sunami@Sunamis-MacBook-Pro packaging % git add ../src/python/RTMonLibs/DiagramWorker.py
(base) sunami@Sunamis-MacBook-Pro packaging % git commit -m "Added BGP"
[imageserver b6fd690] Added BGP
Committer: Sunami Dasgupta <[email protected]>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name "Your Name"
git config --global user.email [email protected]
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 43 insertions(+)
(base) sunami@Sunamis-MacBook-Pro packaging % git push origin diagram-branch
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
To https://github.com/esnet/sense-rtmon/
f1fcc5d..98e18f4 diagram-branch -> diagram-branch
(base) sunami@Sunamis-MacBook-Pro packaging % git status
On branch imageserver
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: files/etc/grid-security/hostcert.pem
modified: files/etc/grid-security/hostkey.pem
modified: files/etc/rtmon.yaml
modified: files/etc/sense-o-auth.yaml
modified: start-dev.sh
modified: ../src/python/RTMonLibs/imageserver.py
Untracked files:
(use "git add <file>..." to include in what will be committed)
diagram.png
diagram2.png
../src/python/RTMonLibs/__pycache__/
no changes added to commit (use "git add" and/or "git commit -a")
(base) sunami@Sunamis-MacBook-Pro packaging %
|
|
|
|
|
|
Based on output:
|
|
Oh Got it |
|
@juztas Let me do the class inheritance after image server. |
added 2 commits
November 13, 2024 10:45
|
|
juztas
requested changes
Dec 3, 2024
| from diagrams import Diagram, Cluster, Edge | ||
| from diagrams.custom import Custom | ||
| from RTMonLibs.GeneralLibs import _processName | ||
| # # change later: |
| HOST_ICON_PATH = '/srv/icons/host.png' | ||
| SWITCH_ICON_PATH = '/srv/icons/switch.png' | ||
| # # TEmp | ||
| # HOST_ICON_PATH = '/Users/sunami/Desktop/publish/sense-rtmon/autogole-api/packaging/icons/host.png' |
|
|
||
| from RTMonLibs.GeneralLibs import loadJson, dumpJson, dumpYaml, escape, getUUID, _processName | ||
| from RTMonLibs.DiagramWorker import DiagramWorker | ||
| #import json |
There was a problem hiding this comment.
same here (why we need this commented line?)
| #Generate Diagrams | ||
| try: | ||
| diagram_filename = f"{self.config.get('image_dir', '/srv/images')}/diagram_{kwargs['referenceUUID']}" | ||
| # diagram_json = f"diagram_{kwargs['referenceUUID']}.json" |
|
one time I got this kind of error: Traceback (most recent call last):
File "src/python/RTMon/worker.py", line 272, in <module>
worker.startwork()
File "src/python/RTMon/worker.py", line 231, in startwork
self._startwork()
File "src/python/RTMon/worker.py", line 254, in _startwork
self.main()
File "src/python/RTMon/worker.py", line 218, in main
self.submit_exe(filename, fout)
File "src/python/RTMon/worker.py", line 50, in submit_exe
manifest = self.s_getManifest(instance)
File "/opt/devrtmon/src/python/RTMonLibs/SenseAPI.py", line 79, in s_getManifest
response = wApi.manifest_create(dumpJson(template, self.logger))
File "/usr/local/lib/python3.6/site-packages/sense/common.py", line 21, in wrapper
result = func(*args, **kwargs)
File "/usr/local/lib/python3.6/site-packages/sense/client/workflow_combined_api.py", line 680, in manifest_create
body_xml, **kwargs) # noqa: E501
File "/usr/local/lib/python3.6/site-packages/sense/common.py", line 21, in wrapper
result = func(*args, **kwargs)
File "/usr/local/lib/python3.6/site-packages/sense/client/workflow_combined_api.py", line 736, in instance_si_uuid_manifest_post_with_http_info
content_type='xml')
File "/usr/local/lib/python3.6/site-packages/sense/common.py", line 21, in wrapper
result = func(*args, **kwargs)
File "/usr/local/lib/python3.6/site-packages/sense/client/requestwrapper.py", line 156, in request
f"Returned code {ret.status_code} with error '{error_message}'")
ValueError: Returned code 500 with error 'Unexpected character ('<' (code 60)): expected a valid value (number, String, array, object, 'true', 'false' or 'null')
at [Source: (io.undertow.servlet.spec.ServletInputStreamImpl); line: 1, column: 2]' |
@sunami09 It would be more useful if you can provide the context of this error, such as service instance UUID. If that is gone, let's keep an eye on it and report it sooner next time you see it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
graphvizto the list of installed dependenciesdiagramspackage.host.png,switch.png) in/srv/icons/for use in the diagram generation.DiagramWorkerclass inRTMonLibs/DiagramWorker.pyresponsible for generating network topology diagrams using thediagramspackage.worker.pyto delete generated diagram images when executions are deleted.DiagramWorkerinto the template creation process/srv/imageswith a unique reference ID for easy tracking.