X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Foperations%2Feditconfig%2FEditStrategyType.java;h=25d772f4ac565c5ecd4d1e84c1b98d302b810f52;hb=396cfb3692d1db20e429462cc1862e5eeb7fe4a4;hp=cb03342a1e1febf8d883b1a47ac271ade2c96637;hpb=d77ff43c050b0d97188b97f8e169626a9f253b71;p=controller.git diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java index cb03342a1e..25d772f4ac 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java @@ -10,8 +10,9 @@ package org.opendaylight.controller.netconf.confignetconfconnector.operations.ed import java.util.EnumSet; import java.util.Set; +import org.opendaylight.controller.netconf.api.NetconfDocumentedException; +import org.opendaylight.controller.netconf.confignetconfconnector.exception.OperationNotPermittedException; -//FIXME: make thread safe public enum EditStrategyType { // can be default merge, replace, none, @@ -39,7 +40,22 @@ public enum EditStrategyType { + this); } } + public static void compareParsedStrategyToDefaultEnforcing(EditStrategyType parsedStrategy, + EditStrategyType defaultStrategy) throws OperationNotPermittedException { + if (defaultStrategy.isEnforcing()) { + if (parsedStrategy != defaultStrategy){ + throw new OperationNotPermittedException(String.format("With " + + defaultStrategy + + " as " + + EditConfigXmlParser.DEFAULT_OPERATION_KEY + + " operations on module elements are not permitted since the default option is restrictive"), + NetconfDocumentedException.ErrorType.application, + NetconfDocumentedException.ErrorTag.operation_failed, + NetconfDocumentedException.ErrorSeverity.error); + } + } + } public EditConfigStrategy getFittingStrategy() { switch (this) { case merge: