| commit | e277ebe5b180d3654f68dbb7d6aab52b89ecf9f7 | [log] [tgz] |
|---|---|---|
| author | Jian Li <pyguni@gmail.com> | Thu Apr 07 11:41:51 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Fri Apr 08 02:22:20 2016 +0000 |
| tree | e0aa2fde258b08d405ec25b9478a0652897e7f0c | |
| parent | 019877f1bc6651bd0d297a31ed0cb8574c72a050 [diff] |
Change CPMan REST prefix to resolve confliction with core REST API Change-Id: I46a0aea4720bcb479a005477a16085a777dbf298
diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/ControlMetricsWebResource.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/ControlMetricsWebResource.java index 8fb899d..1ac1420 100644 --- a/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/ControlMetricsWebResource.java +++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/rest/ControlMetricsWebResource.java
@@ -47,7 +47,7 @@ /** * Query control metrics. */ -@Path("metrics") +@Path("controlmetrics") public class ControlMetricsWebResource extends AbstractWebResource { private final ControlPlaneMonitorService monitorService =
diff --git a/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsResourceTest.java b/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsResourceTest.java index e78d3cd..23a9ab8 100644 --- a/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsResourceTest.java +++ b/apps/cpman/app/src/test/java/org/onosproject/cpman/rest/ControlMetricsResourceTest.java
@@ -60,7 +60,7 @@ NodeId nodeId; ControlLoad mockControlLoad; - private static final String PREFIX = "metrics"; + private static final String PREFIX = "controlmetrics"; /** * Constructs a control metrics resource test instance.