[ONOS-4671]PCECC defect fix , regarding bandwidth and CLI
Change-Id: I31c1d3fe017ae06dd6626ef11073891c20d126ef
Showing
5 changed files
with
17 additions
and
8 deletions
... | @@ -35,6 +35,7 @@ import org.slf4j.Logger; | ... | @@ -35,6 +35,7 @@ import org.slf4j.Logger; |
35 | description = "Supports querying PCE path.") | 35 | description = "Supports querying PCE path.") |
36 | public class PceQueryPathCommand extends AbstractShellCommand { | 36 | public class PceQueryPathCommand extends AbstractShellCommand { |
37 | private final Logger log = getLogger(getClass()); | 37 | private final Logger log = getLogger(getClass()); |
38 | + public static final String COST_TYPE = "costType"; | ||
38 | 39 | ||
39 | @Option(name = "-i", aliases = "--id", description = "path-id", required = false, | 40 | @Option(name = "-i", aliases = "--id", description = "path-id", required = false, |
40 | multiValued = false) | 41 | multiValued = false) |
... | @@ -71,16 +72,16 @@ public class PceQueryPathCommand extends AbstractShellCommand { | ... | @@ -71,16 +72,16 @@ public class PceQueryPathCommand extends AbstractShellCommand { |
71 | * @param tunnel pce tunnel | 72 | * @param tunnel pce tunnel |
72 | */ | 73 | */ |
73 | void display(Tunnel tunnel) { | 74 | void display(Tunnel tunnel) { |
74 | - print("\npath-id : %d \n" + | 75 | + print("\npath-id : %s \n" + |
75 | "source : %s \n" + | 76 | "source : %s \n" + |
76 | "destination : %s \n" + | 77 | "destination : %s \n" + |
77 | - "path-type : %d \n" + | 78 | + "path-type : %s \n" + |
78 | "symbolic-path-name : %s \n" + | 79 | "symbolic-path-name : %s \n" + |
79 | "constraints: \n" + | 80 | "constraints: \n" + |
80 | - " cost : %d \n" + | 81 | + " cost : %s \n" + |
81 | - " bandwidth : %.2f", | 82 | + " bandwidth : %s", |
82 | tunnel.tunnelId().id(), tunnel.src().toString(), tunnel.dst().toString(), | 83 | tunnel.tunnelId().id(), tunnel.src().toString(), tunnel.dst().toString(), |
83 | - tunnel.type(), tunnel.tunnelName(), tunnel.path().cost(), | 84 | + tunnel.type().name(), tunnel.tunnelName(), tunnel.annotations().value(COST_TYPE), |
84 | tunnel.annotations().value(AnnotationKeys.BANDWIDTH)); | 85 | tunnel.annotations().value(AnnotationKeys.BANDWIDTH)); |
85 | } | 86 | } |
86 | } | 87 | } | ... | ... |
... | @@ -86,9 +86,10 @@ public class PceSetupPathCommand extends AbstractShellCommand { | ... | @@ -86,9 +86,10 @@ public class PceSetupPathCommand extends AbstractShellCommand { |
86 | LspType lspType = LspType.values()[type]; | 86 | LspType lspType = LspType.values()[type]; |
87 | 87 | ||
88 | // Add bandwidth | 88 | // Add bandwidth |
89 | - // bandwidth default data rate unit is in BPS | 89 | + // bandwidth default data rate unit is in MBPS, since bandwidth value in network config |
90 | + //stored in MPBS | ||
90 | if (bandwidth != 0.0) { | 91 | if (bandwidth != 0.0) { |
91 | - listConstrnt.add(BandwidthConstraint.of(bandwidth, DataRateUnit.valueOf("BPS"))); | 92 | + listConstrnt.add(BandwidthConstraint.of(bandwidth, DataRateUnit.valueOf("MBPS"))); |
92 | } | 93 | } |
93 | 94 | ||
94 | // Add cost | 95 | // Add cost | ... | ... |
... | @@ -31,6 +31,7 @@ | ... | @@ -31,6 +31,7 @@ |
31 | <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact> | 31 | <artifact>mvn:${project.groupId}/onos-pcep-provider-topology/${project.version}</artifact> |
32 | <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact> | 32 | <artifact>mvn:${project.groupId}/onos-pcep-provider-tunnel/${project.version}</artifact> |
33 | <artifact>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</artifact> | 33 | <artifact>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</artifact> |
34 | - <artifact>mvn:${project.groupId}/onos-app-pce/${project.version}</artifact>b | 34 | + <artifact>mvn:${project.groupId}/onos-bgpcep-provider-flow/${project.version}</artifact> |
35 | + <artifact>mvn:${project.groupId}/onos-app-pce/${project.version}</artifact> | ||
35 | <artifact>mvn:${project.groupId}/onos-app-pceweb/${project.version}</artifact> | 36 | <artifact>mvn:${project.groupId}/onos-app-pceweb/${project.version}</artifact> |
36 | </app> | 37 | </app> | ... | ... |
... | @@ -32,5 +32,6 @@ | ... | @@ -32,5 +32,6 @@ |
32 | <bundle>mvn:${project.groupId}/onos-app-pce/${project.version}</bundle> | 32 | <bundle>mvn:${project.groupId}/onos-app-pce/${project.version}</bundle> |
33 | <bundle>mvn:${project.groupId}/onos-app-pceweb/${project.version}</bundle> | 33 | <bundle>mvn:${project.groupId}/onos-app-pceweb/${project.version}</bundle> |
34 | <bundle>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</bundle> | 34 | <bundle>mvn:${project.groupId}/onos-pcep-provider-packet/${project.version}</bundle> |
35 | + <bundle>mvn:${project.groupId}/onos-bgpcep-provider-flow/${project.version}</bundle> | ||
35 | </feature> | 36 | </feature> |
36 | </features> | 37 | </features> | ... | ... |
... | @@ -99,5 +99,10 @@ | ... | @@ -99,5 +99,10 @@ |
99 | <artifactId>onos-pcep-provider-packet</artifactId> | 99 | <artifactId>onos-pcep-provider-packet</artifactId> |
100 | <version>${project.version}</version> | 100 | <version>${project.version}</version> |
101 | </dependency> | 101 | </dependency> |
102 | + <dependency> | ||
103 | + <groupId>org.onosproject</groupId> | ||
104 | + <artifactId>onos-bgpcep-provider-flow</artifactId> | ||
105 | + <version>${project.version}</version> | ||
106 | + </dependency> | ||
102 | </dependencies> | 107 | </dependencies> |
103 | </project> | 108 | </project> | ... | ... |
-
Please register or login to post a comment