Skip to content
This repository was archived by the owner on Jun 27, 2018. It is now read-only.

Commit e703697

Browse files
author
Joshua Reich
committed
removed dead comments
1 parent ad56f39 commit e703697

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

pyretic/core/classifier.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ def __add__(c1, c2):
145145
def _cross(r1,r2):
146146
intersection = r1.match.intersect(r2.match)
147147
if intersection != drop:
148-
# TODO (josh) logic for detecting when sets of actions can't be combined
149-
# e.g., [modify(dstip='10.0.0.1'),fwd(1)] + [modify(srcip='10.0.0.2'),fwd(2)]
150148
actions = r1.actions | r2.actions
151149
return Rule(intersection, actions)
152150
else:
@@ -200,8 +198,6 @@ def _commute_test(act, pkts):
200198
return identity
201199
return match(**new_match_dict)
202200
else:
203-
# TODO (cole) use compile error.
204-
# TODO (cole) what actions are allowable?
205201
raise TypeError
206202

207203
# sequentially compose actions. a1 must be a

pyretic/core/runtime.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,9 @@ def install_classifier(self, classifier):
330330

331331
### CLASSIFIER TRANSFORMS
332332

333+
# TODO (josh) logic for detecting action sets that can't be compiled
334+
# e.g., {modify(dstip='10.0.0.1',outport=1),modify(srcip='10.0.0.2',outport=2)]
335+
333336
def remove_identity(classifier):
334337
"""
335338
Removes identity policies from the action list.
@@ -339,8 +342,6 @@ def remove_identity(classifier):
339342
:returns: the output classifier
340343
:rtype: Classifier
341344
"""
342-
# DISCUSS (cole): convert identity to inport rather
343-
# than drop?
344345
return Classifier(Rule(rule.match,
345346
filter(lambda a: a != identity,rule.actions))
346347
for rule in classifier.rules)

0 commit comments

Comments
 (0)