Committed by
Gerrit Code Review
Added CLI to flush flow rules installed by cordvtn
Might be useful to refresh data plane with most recent status of Neutron and VMs by flushing all existing rules and pushing network config again And also removed read configuration during activation since leadership service does not work as expected during app activation Change-Id: Ia22fe02d25a61126f3e6df59fc5ad4d065f89f18
Showing
4 changed files
with
53 additions
and
1 deletions
... | @@ -237,7 +237,6 @@ public class CordVtnNodeManager { | ... | @@ -237,7 +237,6 @@ public class CordVtnNodeManager { |
237 | 237 | ||
238 | deviceService.addListener(deviceListener); | 238 | deviceService.addListener(deviceListener); |
239 | configService.addListener(configListener); | 239 | configService.addListener(configListener); |
240 | - readConfiguration(); | ||
241 | } | 240 | } |
242 | 241 | ||
243 | @Deactivate | 242 | @Deactivate |
... | @@ -315,6 +314,13 @@ public class CordVtnNodeManager { | ... | @@ -315,6 +314,13 @@ public class CordVtnNodeManager { |
315 | } | 314 | } |
316 | 315 | ||
317 | /** | 316 | /** |
317 | + * Flush flows installed by cordvtn. | ||
318 | + */ | ||
319 | + public void flushRules() { | ||
320 | + ruleInstaller.flushRules(); | ||
321 | + } | ||
322 | + | ||
323 | + /** | ||
318 | * Returns if current node state saved in nodeStore is COMPLETE or not. | 324 | * Returns if current node state saved in nodeStore is COMPLETE or not. |
319 | * | 325 | * |
320 | * @param node cordvtn node | 326 | * @param node cordvtn node | ... | ... |
... | @@ -172,6 +172,13 @@ public class CordVtnRuleInstaller { | ... | @@ -172,6 +172,13 @@ public class CordVtnRuleInstaller { |
172 | } | 172 | } |
173 | 173 | ||
174 | /** | 174 | /** |
175 | + * Flush flows installed by this application. | ||
176 | + */ | ||
177 | + public void flushRules() { | ||
178 | + flowRuleService.getFlowRulesById(appId).forEach(flowRule -> processFlowRule(false, flowRule)); | ||
179 | + } | ||
180 | + | ||
181 | + /** | ||
175 | * Populates basic rules that connect a VM to the other VMs in the system. | 182 | * Populates basic rules that connect a VM to the other VMs in the system. |
176 | * | 183 | * |
177 | * @param host host | 184 | * @param host host | ... | ... |
1 | +/* | ||
2 | + * Copyright 2016 Open Networking Laboratory | ||
3 | + * | ||
4 | + * Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | + * you may not use this file except in compliance with the License. | ||
6 | + * You may obtain a copy of the License at | ||
7 | + * | ||
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | + * | ||
10 | + * Unless required by applicable law or agreed to in writing, software | ||
11 | + * distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | + * See the License for the specific language governing permissions and | ||
14 | + * limitations under the License. | ||
15 | + */ | ||
16 | + | ||
17 | +package org.onosproject.cordvtn.cli; | ||
18 | + | ||
19 | +import org.apache.karaf.shell.commands.Command; | ||
20 | +import org.onosproject.cli.AbstractShellCommand; | ||
21 | +import org.onosproject.cordvtn.CordVtnNodeManager; | ||
22 | + | ||
23 | +/** | ||
24 | + * Deletes nodes from the service. | ||
25 | + */ | ||
26 | +@Command(scope = "onos", name = "cordvtn-flush-rules", | ||
27 | + description = "Flush flow rules installed by CORD VTN") | ||
28 | +public class CordVtnFlushRules extends AbstractShellCommand { | ||
29 | + | ||
30 | + @Override | ||
31 | + protected void execute() { | ||
32 | + CordVtnNodeManager nodeManager = AbstractShellCommand.get(CordVtnNodeManager.class); | ||
33 | + nodeManager.flushRules(); | ||
34 | + print("Successfully flushed"); | ||
35 | + } | ||
36 | +} |
... | @@ -28,5 +28,8 @@ | ... | @@ -28,5 +28,8 @@ |
28 | <command> | 28 | <command> |
29 | <action class="org.onosproject.cordvtn.cli.CordVtnNodeCheckCommand"/> | 29 | <action class="org.onosproject.cordvtn.cli.CordVtnNodeCheckCommand"/> |
30 | </command> | 30 | </command> |
31 | + <command> | ||
32 | + <action class="org.onosproject.cordvtn.cli.CordVtnFlushRules"/> | ||
33 | + </command> | ||
31 | </command-bundle> | 34 | </command-bundle> |
32 | </blueprint> | 35 | </blueprint> | ... | ... |
-
Please register or login to post a comment