Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
opennsa3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michal Hažlinský
opennsa3
Commits
2aa72b99
Commit
2aa72b99
authored
11 years ago
by
Henrik Thostrup Jensen
Browse files
Options
Downloads
Patches
Plain Diff
remove some old cruft from aggregator (first prep for two-step chain reserve)
parent
82411cab
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
opennsa/aggregator.py
+3
-28
3 additions, 28 deletions
opennsa/aggregator.py
with
3 additions
and
28 deletions
opennsa/aggregator.py
+
3
−
28
View file @
2aa72b99
...
...
@@ -272,21 +272,14 @@ class Aggregator:
log
.
msg
(
'
Connection %s: Local link creation: %s %s?%s == %s?%s
'
%
path_info
,
system
=
LOG_SYSTEM
)
paths
=
[
[
nsa
.
Link
(
self
.
network
,
conn
.
source_port
,
conn
.
dest_port
,
conn
.
source_label
,
conn
.
dest_label
)
]
]
# we should probably specify the connection id to the backend,
# to make it seem like the aggregator isn't here
else
:
# log about creation and the connection type
log
.
msg
(
'
Connection %s: Aggregate path creation: %s -> %s
'
%
(
conn
.
connection_id
,
str
(
source_stp
),
str
(
dest_stp
)),
system
=
LOG_SYSTEM
)
# making the connection is the same for all though :-)
# paths = self.topology.findPaths(source_stp, dest_stp, conn.bandwidth)
# # error out if we could not find a path
# if not paths:
# error_msg = 'Could not find a path for route %s/%s -> %s/%s' % (source_stp.network, source_stp.port, dest_stp.network, dest_stp.port)
# log.msg(error_msg, system=LOG_SYSTEM)
# raise error.TopologyError(error_msg)
# paths.sort(key=lambda e : len(e))
# -- vector chain path selection
# how to this with path vector
# 1. find topology to use from vector
# 2. create abstracted path: local link + rest
...
...
@@ -369,24 +362,6 @@ class Aggregator:
# Don't bother trying to save connection here, wait for reserveConfirmed
# @defer.inlineCallbacks
# def reserveResponse(connection_id, link_provider_nsa, order_id):
# # need to collapse the label values when getting reserveConfirm
# log.msg('Connection reservation for %s via %s acked' % (connection_id, link_provider_nsa), debug=True, system=LOG_SYSTEM)
# # should probably do some sanity checks here
# sp = service_params
# local_link = True if link_provider_nsa == self.nsa_ else False
# sc = database.SubConnection(provider_nsa=link_provider_nsa.urn(),
# connection_id=connection_id, local_link=local_link, revision=0, service_connection_id=conn.id, order_id=order_id,
# global_reservation_id=global_reservation_id, description=description,
# reservation_state=state.RESERVE_START, provision_state=state.RELEASED, lifecycle_state=state.CREATED, data_plane_active=False,
# source_network=sp.source_stp.network, source_port=sp.source_stp.port, source_label=sp.source_stp.label,
# dest_network=sp.dest_stp.network, dest_port=sp.dest_stp.port, dest_label=sp.dest_stp.label,
# start_time=sp.start_time.isoformat(), end_time=sp.end_time.isoformat(), bandwidth=sp.bandwidth)
# yield sc.save()
# defer.returnValue(sc)
#
# d.addCallback(reserveResponse, provider_nsa, idx)
results
=
yield
defer
.
DeferredList
(
[
c
[
0
]
for
c
in
conn_info
],
consumeErrors
=
True
)
# doesn't errback
successes
=
[
r
[
0
]
for
r
in
results
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment