Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 2701: Fixed dependencies for features-netconf.
[controller.git]
/
opendaylight
/
netconf
/
config-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
confignetconfconnector
/
osgi
/
NetconfOperationServiceImpl.java
diff --git
a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
index 1069858b4777008a321b7021beb172ca951675df..902be44fd9d78847d218fea620993d411b099314 100644
(file)
--- a/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
+++ b/
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
@@
-8,11
+8,15
@@
package org.opendaylight.controller.netconf.confignetconfconnector.osgi;
package org.opendaylight.controller.netconf.confignetconfconnector.osgi;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map;
import java.util.Set;
-
import org.opendaylight.controller.config.api.LookupRegistry;
import org.opendaylight.controller.config.util.ConfigRegistryJMXClient;
import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry;
import org.opendaylight.controller.config.api.LookupRegistry;
import org.opendaylight.controller.config.util.ConfigRegistryJMXClient;
import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry;
@@
-23,11
+27,6
@@
import org.opendaylight.controller.netconf.mapping.api.NetconfOperation;
import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService;
import org.opendaylight.yangtools.yang.model.api.Module;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
/**
* Manages life cycle of {@link YangStoreSnapshot}.
*/
/**
* Manages life cycle of {@link YangStoreSnapshot}.
*/
@@
-38,8
+37,8
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
private final Set<Capability> capabilities;
private final TransactionProvider transactionProvider;
private final Set<Capability> capabilities;
private final TransactionProvider transactionProvider;
- public NetconfOperationServiceImpl(
YangStoreService yangStoreService,
ConfigRegistryJMXClient jmxClient,
- String netconfSessionIdForReporting) throws YangStoreException {
+ public NetconfOperationServiceImpl(
final YangStoreService yangStoreService, final
ConfigRegistryJMXClient jmxClient,
+
final
String netconfSessionIdForReporting) throws YangStoreException {
yangStoreSnapshot = yangStoreService.getYangStoreSnapshot();
checkConsistencyBetweenYangStoreAndConfig(jmxClient, yangStoreSnapshot);
yangStoreSnapshot = yangStoreService.getYangStoreSnapshot();
checkConsistencyBetweenYangStoreAndConfig(jmxClient, yangStoreSnapshot);
@@
-52,7
+51,7
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
@VisibleForTesting
@VisibleForTesting
- static void checkConsistencyBetweenYangStoreAndConfig(
LookupRegistry jmxClient,
YangStoreSnapshot yangStoreSnapshot) {
+ static void checkConsistencyBetweenYangStoreAndConfig(
final LookupRegistry jmxClient, final
YangStoreSnapshot yangStoreSnapshot) {
Set<String> missingModulesFromConfig = Sets.newHashSet();
Set<String> modulesSeenByConfig = jmxClient.getAvailableModuleFactoryQNames();
Set<String> missingModulesFromConfig = Sets.newHashSet();
Set<String> modulesSeenByConfig = jmxClient.getAvailableModuleFactoryQNames();
@@
-91,12
+90,14
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
return operationProvider.getOperations();
}
return operationProvider.getOperations();
}
- private static Set<Capability> setupCapabilities(YangStoreSnapshot yangStoreSnapshot) {
+ private static Set<Capability> setupCapabilities(
final
YangStoreSnapshot yangStoreSnapshot) {
Set<Capability> capabilities = new HashSet<>();
// [RFC6241] 8.3. Candidate Configuration Capability
capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:candidate:1.0"));
Set<Capability> capabilities = new HashSet<>();
// [RFC6241] 8.3. Candidate Configuration Capability
capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:candidate:1.0"));
+
+ // TODO rollback on error not supported EditConfigXmlParser:100
// [RFC6241] 8.5. Rollback-on-Error Capability
// [RFC6241] 8.5. Rollback-on-Error Capability
- capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:rollback-on-error:1.0"));
+
//
capabilities.add(new BasicCapability("urn:ietf:params:netconf:capability:rollback-on-error:1.0"));
Set<Module> modules = yangStoreSnapshot.getModules();
for (Module module : modules) {
Set<Module> modules = yangStoreSnapshot.getModules();
for (Module module : modules) {
@@
-110,7
+111,7
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
private final String capability;
private final String capability;
- private BasicCapability(String capability) {
+ private BasicCapability(
final
String capability) {
this.capability = capability;
}
this.capability = capability;
}
@@
-140,8
+141,8
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
}
@Override
}
@Override
- public
Optional<List<String>
> getLocation() {
- return
Optional.absen
t();
+ public
Collection<String
> getLocation() {
+ return
Collections.emptyLis
t();
}
@Override
}
@Override
@@
-157,7
+158,7
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
private final String moduleName;
private final String moduleNamespace;
private final String moduleName;
private final String moduleNamespace;
- public YangStoreCapability(
Module module,
String moduleContent) {
+ public YangStoreCapability(
final Module module, final
String moduleContent) {
super(toCapabilityURI(module));
this.content = moduleContent;
this.moduleName = module.getName();
super(toCapabilityURI(module));
this.content = moduleContent;
this.moduleName = module.getName();
@@
-170,7
+171,7
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
return Optional.of(content);
}
return Optional.of(content);
}
- private static String toCapabilityURI(Module module) {
+ private static String toCapabilityURI(
final
Module module) {
return String.valueOf(module.getNamespace()) + "?module="
+ module.getName() + "&revision=" + Util.writeDate(module.getRevision());
}
return String.valueOf(module.getNamespace()) + "?module="
+ module.getName() + "&revision=" + Util.writeDate(module.getRevision());
}