chg: usr: Add support for subnodes #92
Merged
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
lib/topology/graph/__init__.py
Outdated
| from .graph import TopologyGraph | ||
|
|
||
|
|
||
| __all__ = ["TopologyGraph", "Link", "Node", "Port"] |
There was a problem hiding this comment.
Suggested change
| __all__ = ["TopologyGraph", "Link", "Node", "Port"] | |
| __all__ = ['TopologyGraph', 'Link', 'Node', 'Port'] |
| """ | ||
| Raised when there are inconsistencies in the topology. | ||
| """ | ||
| pass |
There was a problem hiding this comment.
Suggested change
| pass | |
| pass | |
| __all__ = [ | |
| 'NotFound', | |
| 'AlreadyExists', | |
| 'Inconsistent', | |
| ] |
lib/topology/graph/graph.py
Outdated
| from typing_extensions import Self | ||
| from warnings import warn | ||
|
|
||
| from .exceptions import Inconsistent, NotFound, AlreadyExists |
There was a problem hiding this comment.
Narrow to large or large to narrow, choose one and stick with it. Use narrow to large.
lib/topology/graph/graph.py
Outdated
| """ | ||
| if node.identifier in self._nodes: | ||
| raise AlreadyExists( | ||
| f"Node {node.identifier} already exists in the topology") |
There was a problem hiding this comment.
Suggested change
| f"Node {node.identifier} already exists in the topology") | |
| f'Node {node.identifier} already exists in the topology' | |
| ) |
lib/topology/graph/graph.py
Outdated
| """ | ||
| if link.identifier in self._links: | ||
| raise AlreadyExists( | ||
| f"Link {link.identifier} already exists in the topology") |
There was a problem hiding this comment.
Suggested change
| f"Link {link.identifier} already exists in the topology") | |
| f'Link {link.identifier} already exists in the topology' | |
| ) |
lib/topology/graph/graph.py
Outdated
| :param port_id: The id of the port to return. | ||
| """ | ||
| if port_id not in self._ports: | ||
| raise NotFound(f"Port {port_id} not found in the topology") |
There was a problem hiding this comment.
Suggested change
| raise NotFound(f"Port {port_id} not found in the topology") | |
| raise NotFound(f'Port {port_id} not found in the topology') |
lib/topology/graph/graph.py
Outdated
| This method exists for backwards compatibility. Use links() instead. | ||
| """ | ||
| warn( | ||
| "TopologyGraph.bilinks() is deprecated. Use links() instead.", |
There was a problem hiding this comment.
Suggested change
| "TopologyGraph.bilinks() is deprecated. Use links() instead.", | |
| 'TopologyGraph.bilinks() is deprecated. Use links() instead.', |
lib/topology/graph/graph.py
Outdated
| f"{link.node2.identifier}") | ||
|
|
||
|
|
||
| __all__ = ["TopologyGraph"] |
There was a problem hiding this comment.
Suggested change
| __all__ = ["TopologyGraph"] | |
| __all__ = ['TopologyGraph'] |
lib/topology/graph/link.py
Outdated
| return (node_id, port_id) in self.identifier | ||
|
|
||
|
|
||
| __all__ = ["Link"] |
There was a problem hiding this comment.
Suggested change
| __all__ = ["Link"] | |
| __all__ = ['Link'] |
requirements.txt
Outdated
| @@ -8,3 +8,5 @@ pexpect>=4.6 | |||
| pyparsing | |||
| pynml | |||
| pyszn>=1.4.0 | |||
| objns | |||
| typing_extensions | |||
There was a problem hiding this comment.
Really really needed?
sergiosmcr
force-pushed
the
salazar/subnodes
branch
2 times, most recently
from
1d0f871
to
77b5e15
Compare
- Replace NMLExtendedManager by a new TopologyGraph class and other classes for Node, Link and Port. - Drop supports for NML and graphviz plot output which implies removing these pytest plugin flags: - --topology-nml-dir - --topology-plot-dir - --topology-plot-format
sergiosmcr
force-pushed
the
salazar/subnodes
branch
from
77b5e15
to
8c94199
Compare
sergiosmcr
changed the title
dajose
approved these changes
Aug 3, 2022
| mkpath(args.nml_dir) | ||
|
|
||
| # Determine NML export directory and create it if required | ||
| if args.nml_dir: |
There was a problem hiding this comment.
❤️
Love to deprecate old things nobody uses.
carlos-jenkins
approved these changes
Aug 9, 2022
| mkpath(args.nml_dir) | ||
|
|
||
| # Determine NML export directory and create it if required | ||
| if args.nml_dir: |
There was a problem hiding this comment.
❤️
Love to deprecate old things nobody uses.
Comment on lines
+108
to
+112
| warn( | ||
| "nml attribute is obsolete and will be removed in future " | ||
| "versions. Use graph attribute instead.", | ||
| DeprecationWarning | ||
| ) |
| @@ -8,3 +8,5 @@ pexpect>=4.6 | |||
| pyparsing | |||
| pynml | |||
| pyszn>=1.4.0 | |||
| typing_extensions | |||
There was a problem hiding this comment.
I still think this isn't required.
|
Great job! Merging without waiting for CI as Travis blocked our account. Migrating to CircleCI or other in another PR. |
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.
No description provided.