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 "Refactor Neutron Pagination Code to support Network, Port and Subnet"
[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 95659ddf914837d32d10c0a4f36525fc03b09764..f5fe089d4d80d1b614636b9522e0963ac2d922c9 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,10
+8,11
@@
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.HashSet;
+import java.util.List;
+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;
@@
-22,10
+23,10
@@
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
java.util.HashSet
;
-import
java.util.List
;
-import
java.util.Map
;
-import
java.util.Set
;
+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}.
@@
-60,8
+61,9
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
for (Map<String, ModuleMXBeanEntry> moduleNameToMBE : moduleMXBeanEntryMap.values()) {
for (ModuleMXBeanEntry moduleMXBeanEntry : moduleNameToMBE.values()) {
String moduleSeenByYangStore = moduleMXBeanEntry.getYangModuleQName().toString();
for (Map<String, ModuleMXBeanEntry> moduleNameToMBE : moduleMXBeanEntryMap.values()) {
for (ModuleMXBeanEntry moduleMXBeanEntry : moduleNameToMBE.values()) {
String moduleSeenByYangStore = moduleMXBeanEntry.getYangModuleQName().toString();
- if(
modulesSeenByConfig.contains(moduleSeenByYangStore) == false)
+ if(
!modulesSeenByConfig.contains(moduleSeenByYangStore)){
missingModulesFromConfig.add(moduleSeenByYangStore);
missingModulesFromConfig.add(moduleSeenByYangStore);
+ }
}
}
}
}
@@
-93,8
+95,10
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
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) {
@@
-141,9
+145,14
@@
public class NetconfOperationServiceImpl implements NetconfOperationService {
public Optional<List<String>> getLocation() {
return Optional.absent();
}
public Optional<List<String>> getLocation() {
return Optional.absent();
}
+
+ @Override
+ public String toString() {
+ return capability;
+ }
}
}
- private static class YangStoreCapability extends BasicCapability {
+ private static
final
class YangStoreCapability extends BasicCapability {
private final String content;
private final String revision;
private final String content;
private final String revision;