Commit 81eb9896 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

SIMAP Connector:

- Updated mocks to update instead of create to prevent already-exists errors
parent c56155a0
Loading
Loading
Loading
Loading
+22 −22
Original line number Diff line number Diff line
@@ -22,21 +22,21 @@ LOGGER = logging.getLogger(__name__)

def set_simap_e2e_net(simap_client : SimapClient) -> None:
    simap = simap_client.network('e2e')
    simap.create(supporting_network_ids=['admin', 'agg'])
    simap.update(supporting_network_ids=['admin', 'agg'])

    node_a = simap.node('sdp1')
    node_a.create(supporting_node_ids=[('admin', 'ONT1')])
    node_a.termination_point('200').create(supporting_termination_point_ids=[('admin', 'ONT1', '200')])
    node_a.termination_point('500').create(supporting_termination_point_ids=[('admin', 'ONT1', '500')])
    node_a.update(supporting_node_ids=[('admin', 'ONT1')])
    node_a.termination_point('200').update(supporting_termination_point_ids=[('admin', 'ONT1', '200')])
    node_a.termination_point('500').update(supporting_termination_point_ids=[('admin', 'ONT1', '500')])

    node_b = simap.node('sdp2')
    node_b.create(supporting_node_ids=[('admin', 'POP2')])
    node_b.termination_point('200').create(supporting_termination_point_ids=[('admin', 'POP2', '200')])
    node_b.termination_point('201').create(supporting_termination_point_ids=[('admin', 'POP2', '201')])
    node_b.termination_point('500').create(supporting_termination_point_ids=[('admin', 'POP2', '500')])
    node_b.update(supporting_node_ids=[('admin', 'POP2')])
    node_b.termination_point('200').update(supporting_termination_point_ids=[('admin', 'POP2', '200')])
    node_b.termination_point('201').update(supporting_termination_point_ids=[('admin', 'POP2', '201')])
    node_b.termination_point('500').update(supporting_termination_point_ids=[('admin', 'POP2', '500')])

    link = simap.link('E2E-L1')
    link.create(
    link.update(
        'sdp1', '500', 'sdp2', '500',
        supporting_link_ids=[
            ('admin', 'L1'), ('admin', 'L3'), ('agg', 'AggNet-L1')
@@ -46,7 +46,7 @@ def set_simap_e2e_net(simap_client : SimapClient) -> None:

def delete_simap_e2e_net(simap_client : SimapClient) -> None:
    simap = simap_client.network('e2e')
    simap.create(supporting_network_ids=['admin', 'agg'])
    simap.update(supporting_network_ids=['admin', 'agg'])

    link = simap.link('E2E-L1')
    link.delete()
@@ -54,23 +54,23 @@ def delete_simap_e2e_net(simap_client : SimapClient) -> None:

def set_simap_agg_net(simap_client : SimapClient) -> None:
    simap = simap_client.network('agg')
    simap.create(supporting_network_ids=['admin', 'trans-pkt'])
    simap.update(supporting_network_ids=['admin', 'trans-pkt'])

    node_a = simap.node('sdp1')
    node_a.create(supporting_node_ids=[('admin', 'OLT')])
    node_a.termination_point('200').create(supporting_termination_point_ids=[('admin', 'OLT', '200')])
    node_a.termination_point('201').create(supporting_termination_point_ids=[('admin', 'OLT', '201')])
    node_a.termination_point('500').create(supporting_termination_point_ids=[('admin', 'OLT', '500')])
    node_a.termination_point('501').create(supporting_termination_point_ids=[('admin', 'OLT', '501')])
    node_a.update(supporting_node_ids=[('admin', 'OLT')])
    node_a.termination_point('200').update(supporting_termination_point_ids=[('admin', 'OLT', '200')])
    node_a.termination_point('201').update(supporting_termination_point_ids=[('admin', 'OLT', '201')])
    node_a.termination_point('500').update(supporting_termination_point_ids=[('admin', 'OLT', '500')])
    node_a.termination_point('501').update(supporting_termination_point_ids=[('admin', 'OLT', '501')])

    node_b = simap.node('sdp2')
    node_b.create(supporting_node_ids=[('admin', 'POP2')])
    node_b.termination_point('200').create(supporting_termination_point_ids=[('admin', 'POP2', '200')])
    node_b.termination_point('201').create(supporting_termination_point_ids=[('admin', 'POP2', '201')])
    node_b.termination_point('500').create(supporting_termination_point_ids=[('admin', 'POP2', '500')])
    node_b.update(supporting_node_ids=[('admin', 'POP2')])
    node_b.termination_point('200').update(supporting_termination_point_ids=[('admin', 'POP2', '200')])
    node_b.termination_point('201').update(supporting_termination_point_ids=[('admin', 'POP2', '201')])
    node_b.termination_point('500').update(supporting_termination_point_ids=[('admin', 'POP2', '500')])

    link = simap.link('AggNet-L1')
    link.create(
    link.update(
        'sdp1', '500', 'sdp2', '500',
        supporting_link_ids=[
            ('trans-pkt', 'Trans-L1'), ('admin', 'L13')
@@ -80,7 +80,7 @@ def set_simap_agg_net(simap_client : SimapClient) -> None:

def delete_simap_agg_net(simap_client : SimapClient) -> None:
    simap = simap_client.network('agg')
    simap.create(supporting_network_ids=['admin', 'trans-pkt'])
    simap.update(supporting_network_ids=['admin', 'trans-pkt'])

    link = simap.link('AggNet-L1')
    link.delete()