Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG 3057 - notify added event source by topics created before"
[controller.git]
/
opendaylight
/
md-sal
/
sal-rest-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
restconf
/
impl
/
RestconfProviderImpl.java
diff --git
a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
index abadbf6cb80a4e15a6d0af8450723954c2f79ffe..624d709c60a7abd761c7c40011ffb0619cd66e4c 100644
(file)
--- a/
opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
+++ b/
opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfProviderImpl.java
@@
-7,7
+7,11
@@
*/
package org.opendaylight.controller.sal.restconf.impl;
*/
package org.opendaylight.controller.sal.restconf.impl;
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.Collections;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Config;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Config;
+import org.opendaylight.controller.config.yang.md.sal.rest.connector.Delete;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Get;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Operational;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Post;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Get;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Operational;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Post;
@@
-16,6
+20,7
@@
import org.opendaylight.controller.config.yang.md.sal.rest.connector.RestConnect
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Rpcs;
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
import org.opendaylight.controller.config.yang.md.sal.rest.connector.Rpcs;
import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
import org.opendaylight.controller.sal.core.api.Provider;
import org.opendaylight.controller.sal.core.api.model.SchemaService;
import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
import org.opendaylight.controller.sal.core.api.Provider;
import org.opendaylight.controller.sal.core.api.model.SchemaService;
@@
-25,10
+30,6
@@
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Collections;
-
public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnector, RestConnectorRuntimeMXBean {
private final StatisticsRestconfServiceWrapper stats = StatisticsRestconfServiceWrapper.getInstance();
public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnector, RestConnectorRuntimeMXBean {
private final StatisticsRestconfServiceWrapper stats = StatisticsRestconfServiceWrapper.getInstance();
@@
-36,19
+37,21
@@
public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnec
private PortNumber port;
private Thread webSocketServerThread;
private PortNumber port;
private Thread webSocketServerThread;
- public void setWebsocketPort(PortNumber port) {
+ public void setWebsocketPort(
final
PortNumber port) {
this.port = port;
}
@Override
this.port = port;
}
@Override
- public void onSessionInitiated(ProviderSession session) {
+ public void onSessionInitiated(
final
ProviderSession session) {
final DOMDataBroker domDataBroker = session.getService(DOMDataBroker.class);
BrokerFacade.getInstance().setContext(session);
BrokerFacade.getInstance().setDomDataBroker( domDataBroker);
final DOMDataBroker domDataBroker = session.getService(DOMDataBroker.class);
BrokerFacade.getInstance().setContext(session);
BrokerFacade.getInstance().setDomDataBroker( domDataBroker);
-
- SchemaService schemaService = session.getService(SchemaService.class);
+ final SchemaService schemaService = session.getService(SchemaService.class);
listenerRegistration = schemaService.registerSchemaContextListener(ControllerContext.getInstance());
listenerRegistration = schemaService.registerSchemaContextListener(ControllerContext.getInstance());
+ BrokerFacade.getInstance().setRpcService(session.getService(DOMRpcService.class));
+
+
ControllerContext.getInstance().setSchemas(schemaService.getGlobalContext());
ControllerContext.getInstance().setMountService(session.getService(DOMMountPointService.class));
ControllerContext.getInstance().setSchemas(schemaService.getGlobalContext());
ControllerContext.getInstance().setMountService(session.getService(DOMMountPointService.class));
@@
-75,34
+78,52
@@
public class RestconfProviderImpl implements Provider, AutoCloseable, RestConnec
@Override
public Config getConfig() {
@Override
public Config getConfig() {
- Config config = new Config();
- Get get = new Get();
+ final Config config = new Config();
+
+ final Get get = new Get();
get.setReceivedRequests(stats.getConfigGet());
get.setReceivedRequests(stats.getConfigGet());
+ get.setSuccessfulResponses(stats.getSuccessGetConfig());
+ get.setFailedResponses(stats.getFailureGetConfig());
config.setGet(get);
config.setGet(get);
- Post post = new Post();
+
+ final Post post = new Post();
post.setReceivedRequests(stats.getConfigPost());
post.setReceivedRequests(stats.getConfigPost());
+ post.setSuccessfulResponses(stats.getSuccessPost());
+ post.setFailedResponses(stats.getFailurePost());
config.setPost(post);
config.setPost(post);
- Put put = new Put();
+
+ final Put put = new Put();
put.setReceivedRequests(stats.getConfigPut());
put.setReceivedRequests(stats.getConfigPut());
+ put.setSuccessfulResponses(stats.getSuccessPut());
+ put.setFailedResponses(stats.getFailurePut());
config.setPut(put);
config.setPut(put);
+
+ final Delete delete = new Delete();
+ delete.setReceivedRequests(stats.getConfigDelete());
+ delete.setSuccessfulResponses(stats.getSuccessDelete());
+ delete.setFailedResponses(stats.getFailureDelete());
+ config.setDelete(delete);
+
return config;
}
@Override
public Operational getOperational() {
return config;
}
@Override
public Operational getOperational() {
- BigInteger opGet = stats.getOperationalGet();
- Operational operational = new Operational();
- Get get = new Get();
+
final
BigInteger opGet = stats.getOperationalGet();
+
final
Operational operational = new Operational();
+
final
Get get = new Get();
get.setReceivedRequests(opGet);
get.setReceivedRequests(opGet);
+ get.setSuccessfulResponses(stats.getSuccessGetOperational());
+ get.setFailedResponses(stats.getFailureGetOperational());
operational.setGet(get);
return operational;
}
@Override
public Rpcs getRpcs() {
operational.setGet(get);
return operational;
}
@Override
public Rpcs getRpcs() {
- BigInteger rpcInvoke = stats.getRpc();
- Rpcs rpcs = new Rpcs();
+
final
BigInteger rpcInvoke = stats.getRpc();
+
final
Rpcs rpcs = new Rpcs();
rpcs.setReceivedRequests(rpcInvoke);
rpcs.setReceivedRequests(rpcInvoke);
- return rpcs
;
+ return rpcs;
}
}
-}
+}
\ No newline at end of file