scottk/oopt-gnpy
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/oopt-gnpy.git synced 2025-11-01 18:47:48 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'refactor_merge' into develop

Browse Source
This commit is contained in:
James Powell
2018-06-05 09:52:13 -04:00
parent 7a6feccc8b f05e578f51
commit c7abe11dd8
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gnpy/core/network.py
View File

@@ -134,7 +134,6 @@ def split_fiber(network, fiber, bounds, target, equipment):
prev_node = [n for n in network.predecessors(fiber)][0] prev_node = [n for n in network.predecessors(fiber)][0]
network.remove_edge(fiber, next_node) network.remove_edge(fiber, next_node)
network.remove_edge(prev_node, fiber) network.remove_edge(prev_node, fiber)
print(fiber.metadata)
new_spans = [ new_spans = [
Fiber( Fiber(
uid = f'{fiber.uid}_({span}/{n_spans})', uid = f'{fiber.uid}_({span}/{n_spans})',
@@ -143,16 +142,17 @@ def split_fiber(network, fiber, bounds, target, equipment):
) for span in range(n_spans) ) for span in range(n_spans)
] ]
for new_span in new_spans: for new_span in new_spans:
print(new_span)
network.add_node(new_span) network.add_node(new_span)
network.add_edge(prev_node, new_span) network.add_edge(prev_node, new_span)
network = add_egress_amplifier(network, new_span, equipment) add_egress_amplifier(network, new_span, equipment)
prev_node = new_span prev_node = new_span
network.add_edge(prev_node, next_node) network.add_edge(prev_node, next_node)
def build_network(network, equipment, bounds=range(75_000, 150_000), target=100_000): def build_network(network, equipment, bounds=range(75_000, 150_000), target=100_000):
for fiber in (f for f in network.nodes() if isinstance(f, Fiber)): fibers = [f for f in network.nodes() if isinstance(f, Fiber)]
for fiber in fibers:
split_fiber(network, fiber, bounds, target, equipment) split_fiber(network, fiber, bounds, target, equipment)
for roadm in (r for r in network.nodes() if isinstance(r, Roadm)): roadms = [r for r in network.nodes() if isinstance(r, Roadm)]
for roadm in roadms:
add_egress_amplifier(network, roadm, equipment) add_egress_amplifier(network, roadm, equipment)

3
gnpy/core/node.py
View File

@@ -29,7 +29,8 @@ class Node:
if name is None: if name is None:
name = uid name = uid
self.uid, self.name = uid, name self.uid, self.name = uid, name
metadata['location'] = Location(**metadata.pop('location', {})) if metadata and not isinstance(metadata.get('location'), Location):
metadata['location'] = Location(**metadata.pop('location', {}))
self.params, self.metadata, self.operational = params, metadata, operational self.params, self.metadata, self.operational = params, metadata, operational
@property @property