update netconf testtool version 08/74508/5
authorMartial COULIBALY <martial.coulibaly@gfi.fr>
Thu, 26 Jul 2018 13:34:53 +0000 (15:34 +0200)
committerguillaume.lambert <guillaume.lambert@orange.com>
Wed, 1 Aug 2018 10:40:08 +0000 (12:40 +0200)
- switches testtool mock version from 1.3.1 to 1.5.0-SNAPSHOT
  (netconf dir git submodule switched to branch 'origin/master'):
  testtool 1.3.1 caused some errors with the fluorine controller for
  several reasons including EXI messages generation.
- updates patches, nose tests files and scripts consequently

JIRA: TRNSPRTPCE-32
Change-Id: I27476ea83edefbffff986ddc856078219f925fc6
Signed-off-by: Martial COULIBALY <martial.coulibaly@gfi.fr>
tests/build.sh
tests/buildTesttool.sh
tests/get_connection_port_trail.patch [deleted file]
tests/netconf
tests/netconf.patch
tests/start.sh
tests/transportpce_tests/test_portmapping.py
tests/transportpce_tests/test_topoPortMapping.py
tests/transportpce_tests/test_topology.py

index 8bacbf413c06de4b2b0d5d75a7d52dc25f22aacf..62efc76f7a5b0b8bbaa307a7ab590a5dd174a890 100755 (executable)
@@ -13,7 +13,7 @@ netconf/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-not
 netconf/netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang"
 
 rm -rf netconf mdsal && git submodule update --init
-(cd netconf && patch -p1 < ../netconf.patch && patch -p1 < ../get_connection_port_trail.patch)
+(cd netconf && patch -p1 < ../netconf.patch)
 
 (cd netconf/netconf/tools/netconf-testtool &&  mvn clean install -DskipTests)
 #Honeynode build
@@ -27,5 +27,6 @@ rm -rf schemas && mkdir -p schemas
 #we expect that the ODL instance compiled with ordm 2.x models will be compatible with ordm 1.2.1 devices
 cp ordmodels_1.2.1/org-openroadm-* schemas
 cp ${yang} schemas
+mkdir -p transportpce_tests/log/
 
 exit $?
index 97b1cca3dc2ea3e7415023a83ea0ac044de68d25..744277bca47810aea81e122299a5d82e436f226a 100755 (executable)
@@ -13,10 +13,11 @@ netconf/netconf/models/ietf-netconf-notifications/src/main/yang/ietf-netconf-not
 netconf/netconf/models/ietf-netconf-notifications/src/main/yang/notifications@2008-07-14.yang"
 
 rm -rf netconf mdsal && git submodule update --init
-(cd netconf && patch -p1 < ../netconf.patch && patch -p1 < ../get_connection_port_trail.patch)
+(cd netconf && patch -p1 < ../netconf.patch )
 (cd netconf/netconf/tools/netconf-testtool && mvn clean install -DskipTests)
 rm -rf schemas && mkdir -p schemas
 cp ordmodels_1.2.1/org-openroadm-* schemas
 cp ${yang} schemas
+mkdir -p transportpce_tests/log/
 
 exit $?
diff --git a/tests/get_connection_port_trail.patch b/tests/get_connection_port_trail.patch
deleted file mode 100644 (file)
index 5a86a85..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
-index eeae4434..0fe027a3 100644
---- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
-+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
-@@ -26,6 +26,7 @@ import org.opendaylight.netconf.test.tool.rpc.SimulatedDiscardChanges;
- import org.opendaylight.netconf.test.tool.rpc.SimulatedEditConfig;
- import org.opendaylight.netconf.test.tool.rpc.SimulatedGet;
- import org.opendaylight.netconf.test.tool.rpc.SimulatedGetConfig;
-+import org.opendaylight.netconf.test.tool.rpc.SimulatedGetConnectionPortTrail;
- import org.opendaylight.netconf.test.tool.rpc.SimulatedLock;
- import org.opendaylight.netconf.test.tool.rpc.SimulatedUnLock;
-@@ -84,6 +85,8 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
-             final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
-             final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(
-                 String.valueOf(currentSessionId), storage, initialConfigXMLFile);
-+            final SimulatedGetConnectionPortTrail sSimulatedConnectionPortTrail = new SimulatedGetConnectionPortTrail(
-+                String.valueOf(currentSessionId));
-             final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(currentSessionId));
-             final SimulatedLock sLock = new SimulatedLock(String.valueOf(currentSessionId));
-             final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(currentSessionId));
-@@ -92,7 +95,8 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
-             final SimulatedDiscardChanges sDiscardChanges = new SimulatedDiscardChanges(
-                 String.valueOf(currentSessionId));
-             return Sets.newHashSet(
--                sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs, sDiscardChanges);
-+                sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs, sDiscardChanges,
-+                sSimulatedConnectionPortTrail);
-         }
-         @Override
-diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConnectionPortTrail.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConnectionPortTrail.java
-new file mode 100644
-index 00000000..664a66df
---- /dev/null
-+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConnectionPortTrail.java
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
-+ *
-+ * This program and the accompanying materials are made available under the
-+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
-+ * and is available at http://www.eclipse.org/legal/epl-v10.html
-+ */
-+
-+package org.opendaylight.netconf.test.tool.rpc;
-+
-+import org.opendaylight.controller.config.util.xml.DocumentedException;
-+import org.opendaylight.controller.config.util.xml.XmlElement;
-+import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation;
-+import org.w3c.dom.Document;
-+import org.w3c.dom.Element;
-+
-+public class SimulatedGetConnectionPortTrail extends AbstractConfigNetconfOperation {
-+
-+    public SimulatedGetConnectionPortTrail(final String netconfSessionIdForReporting) {
-+        super(null, netconfSessionIdForReporting);
-+    }
-+
-+    @Override
-+    protected Element handleWithNoSubsequentOperations(final Document document,
-+            final XmlElement operationElement) throws DocumentedException {
-+        Element portname = document.createElement("port-name");
-+        portname.appendChild(document.createTextNode("L1"));
-+        Element circuitpackname = document.createElement("circuit-pack-name");
-+        circuitpackname.appendChild(document.createTextNode("2/0"));
-+        Element ports = document.createElement("ports");
-+        ports.setAttribute("xmlns", "http://org/openroadm/device");
-+        ports.appendChild(portname);
-+        ports.appendChild(circuitpackname);
-+        return ports;
-+    }
-+
-+    @Override
-+    protected String getOperationName() {
-+        return "get-connection-port-trail";
-+    }
-+
-+    @Override
-+    protected String getOperationNamespace() {
-+        return "http://org/openroadm/device";
-+    }
-+}
index fc2c9d59ba8c17b42118ffe2e92237d92264d5c2..df1a4dbb37e0fb187c6d50d3bab1f9d88b888928 160000 (submodule)
@@ -1 +1 @@
-Subproject commit fc2c9d59ba8c17b42118ffe2e92237d92264d5c2
+Subproject commit df1a4dbb37e0fb187c6d50d3bab1f9d88b888928
index fc03ff4f3184d8e7e0aa15f05f7eab415cac2726..0de041d43ef1bd786266109968023d1418dc0ab2 100644 (file)
 diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
-index 3847ce9b..eeae4434 100644
+index f2828d1..d3026b8 100644
 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
 +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java
-@@ -79,7 +79,8 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
+@@ -26,6 +26,7 @@ import org.opendaylight.netconf.test.tool.rpc.SimulatedDiscardChanges;
+ import org.opendaylight.netconf.test.tool.rpc.SimulatedEditConfig;
+ import org.opendaylight.netconf.test.tool.rpc.SimulatedGet;
+ import org.opendaylight.netconf.test.tool.rpc.SimulatedGetConfig;
++import org.opendaylight.netconf.test.tool.rpc.SimulatedGetConnectionPortTrail;
+ import org.opendaylight.netconf.test.tool.rpc.SimulatedLock;
+ import org.opendaylight.netconf.test.tool.rpc.SimulatedUnLock;
+@@ -38,19 +39,19 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
+                                final Optional<File> notificationsFile,
+                                final Optional<File> initialConfigXMLFile) {
+         this.caps = caps;
+-        simulatedOperationService = new SimulatedOperationService(
++        this.simulatedOperationService = new SimulatedOperationService(
+             idProvider.getCurrentSessionId(), notificationsFile, initialConfigXMLFile);
+     }
+     @Override
+     public Set<Capability> getCapabilities() {
+-        return caps;
++        return this.caps;
+     }
+     @Override
+     public AutoCloseable registerCapabilityListener(
+             final CapabilityListener listener) {
+-        listener.onCapabilitiesChanged(caps, Collections.emptySet());
++        listener.onCapabilitiesChanged(this.caps, Collections.emptySet());
+         return () -> {
+         };
+     }
+@@ -58,7 +59,7 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
+     @Override
+     public NetconfOperationService createService(
+             final String netconfSessionIdForReporting) {
+-        return simulatedOperationService;
++        return this.simulatedOperationService;
+     }
+     static class SimulatedOperationService implements NetconfOperationService {
+@@ -76,19 +77,24 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory {
+         @Override
+         public Set<NetconfOperation> getNetconfOperations() {
+             final DataList storage = new DataList();
+-            final SimulatedGet sGet = new SimulatedGet(String.valueOf(currentSessionId), storage);
+-            final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
++            final SimulatedGet sGet = new SimulatedGet(String.valueOf(this.currentSessionId), storage,
++                    this.initialConfigXMLFile);
++            final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(this.currentSessionId),
++                    storage);
+             final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(
+-                String.valueOf(currentSessionId), storage, initialConfigXMLFile);
+-            final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(currentSessionId));
+-            final SimulatedLock sLock = new SimulatedLock(String.valueOf(currentSessionId));
+-            final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(currentSessionId));
++                String.valueOf(this.currentSessionId), storage, this.initialConfigXMLFile);
++            final SimulatedGetConnectionPortTrail sSimulatedConnectionPortTrail = new SimulatedGetConnectionPortTrail(
++                    String.valueOf(this.currentSessionId));
++            final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(this.currentSessionId));
++            final SimulatedLock sLock = new SimulatedLock(String.valueOf(this.currentSessionId));
++            final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(this.currentSessionId));
+             final SimulatedCreateSubscription sCreateSubs = new SimulatedCreateSubscription(
+-                    String.valueOf(currentSessionId), notificationsFile);
++                    String.valueOf(this.currentSessionId), this.notificationsFile);
+             final SimulatedDiscardChanges sDiscardChanges = new SimulatedDiscardChanges(
+-                String.valueOf(currentSessionId));
++                String.valueOf(this.currentSessionId));
+             return Sets.newHashSet(
+-                sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs, sDiscardChanges);
++                sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs, sDiscardChanges,
++                sSimulatedConnectionPortTrail);
+         }
+         @Override
+diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java
+index 6654425..d5bebd6 100644
+--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java
++++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/config/Configuration.java
+@@ -95,7 +95,7 @@ public class Configuration {
+     }
+     public PublickeyAuthenticator getPublickeyAuthenticator() {
+-        return publickeyAuthenticator;
++        return this.publickeyAuthenticator;
+     }
+     public void setPublickeyAuthenticator(final PublickeyAuthenticator publickeyAuthenticator) {
+@@ -103,7 +103,7 @@ public class Configuration {
+     }
+     public AuthProvider getAuthProvider() {
+-        return authProvider;
++        return this.authProvider;
+     }
+     public void setAuthProvider(final AuthProvider authProvider) {
+@@ -111,7 +111,7 @@ public class Configuration {
+     }
+     public Set<YangResource> getDefaultYangResources() {
+-        return defaultYangResources;
++        return this.defaultYangResources;
+     }
+     public void setDefaultYangResources(final Set<YangResource> defaultYangResources) {
+@@ -119,7 +119,7 @@ public class Configuration {
+     }
+     public int getThreadPoolSize() {
+-        return threadPoolSize;
++        return this.threadPoolSize;
+     }
+     public void setThreadPoolSize(final int threadPoolSize) {
+@@ -127,7 +127,7 @@ public class Configuration {
+     }
+     public int getStartingPort() {
+-        return startingPort;
++        return this.startingPort;
+     }
+     public void setStartingPort(final int startingPort) {
+@@ -135,7 +135,7 @@ public class Configuration {
+     }
+     public int getDeviceCount() {
+-        return deviceCount;
++        return this.deviceCount;
+     }
+     public void setDeviceCount(final int deviceCount) {
+@@ -143,7 +143,7 @@ public class Configuration {
+     }
+     public int getGenerateConfigsTimeout() {
+-        return generateConfigsTimeout;
++        return this.generateConfigsTimeout;
+     }
+     public void setGenerateConfigsTimeout(final int generateConfigsTimeout) {
+@@ -151,7 +151,7 @@ public class Configuration {
+     }
+     public boolean isSsh() {
+-        return ssh;
++        return this.ssh;
+     }
+     public void setSsh(final boolean ssh) {
+@@ -159,7 +159,7 @@ public class Configuration {
+     }
+     public String getIp() {
+-        return ip;
++        return this.ip;
+     }
+     public void setIp(final String ip) {
+@@ -167,7 +167,7 @@ public class Configuration {
+     }
+     public Set<String> getModels() {
+-        return models;
++        return this.models;
+     }
+     public void setModels(final Set<String> models) {
+@@ -175,7 +175,7 @@ public class Configuration {
+     }
+     public Set<String> getCapabilities() {
+-        return capabilities;
++        return this.capabilities;
+     }
+     public void setCapabilities(final Set<String> capabilities) {
+@@ -183,7 +183,7 @@ public class Configuration {
+     }
+     public RpcHandler getRpcHandler() {
+-        return rpcHandler;
++        return this.rpcHandler;
+     }
+     public void setRpcHandler(final RpcHandler rpcHandler) {
+@@ -191,7 +191,7 @@ public class Configuration {
+     }
+     public OperationsCreator getOperationsCreator() {
+-        return operationsCreator;
++        return this.operationsCreator;
+     }
+     public void setOperationsCreator(final OperationsCreator operationsCreator) {
+@@ -200,7 +200,7 @@ public class Configuration {
+     @Deprecated
+     public boolean isMdSal() {
+-        return mdSal;
++        return this.mdSal;
+     }
+     @Deprecated
+@@ -210,7 +210,7 @@ public class Configuration {
+     @Deprecated
+     public File getRpcConfigFile() {
+-        return rpcConfigFile;
++        return this.rpcConfigFile;
+     }
+     @Deprecated
+@@ -220,7 +220,7 @@ public class Configuration {
+     @Deprecated
+     public File getNotificationFile() {
+-        return notificationFile;
++        return this.notificationFile;
+     }
+     @Deprecated
+@@ -230,7 +230,7 @@ public class Configuration {
+     @Deprecated
+     public File getInitialConfigXMLFile() {
+-        return initialConfigXMLFile;
++        return this.initialConfigXMLFile;
+     }
+     @Deprecated
+@@ -240,12 +240,12 @@ public class Configuration {
+     @Deprecated
+     public boolean isXmlConfigurationProvided() {
+-        return initialConfigXMLFile != null && notificationFile != null;
++        return this.initialConfigXMLFile != null;//&& notificationFile != null;
+     }
+     @Deprecated
+     public File getSchemasDir() {
+-        return schemasDir;
++        return this.schemasDir;
+     }
+     @Deprecated
+diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
+index edfdf6e..0bc0b9d 100644
+--- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
++++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java
+@@ -30,14 +30,14 @@ public final class DefaultOperationsCreator implements OperationsCreator {
+     private final SimulatedOperationService simulatedOperationService;
+     private DefaultOperationsCreator(final long currentSessionId) {
+-        simulatedOperationService = new SimulatedOperationService(currentSessionId);
++        this.simulatedOperationService = new SimulatedOperationService(currentSessionId);
+     }
+     @Override
+     public NetconfOperationService getNetconfOperationService(final Set<Capability> caps,
+         final SessionIdProvider idProvider,
+         final String netconfSessionIdForReporting) {
+-        return simulatedOperationService;
++        return this.simulatedOperationService;
+     }
+     public static DefaultOperationsCreator getDefaultOperationServiceCreator(final long currentSessionId) {
+@@ -55,17 +55,19 @@ public final class DefaultOperationsCreator implements OperationsCreator {
          @Override
          public Set<NetconfOperation> getNetconfOperations() {
              final DataList storage = new DataList();
 -            final SimulatedGet sGet = new SimulatedGet(String.valueOf(currentSessionId), storage);
-+            final SimulatedGet sGet = new SimulatedGet(
-+                String.valueOf(currentSessionId), storage, initialConfigXMLFile);
-             final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
+-            final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(currentSessionId), storage);
++            final SimulatedGet sGet = new SimulatedGet(String.valueOf(this.currentSessionId), storage,
++                    Optional.absent());
++            final SimulatedEditConfig sEditConfig = new SimulatedEditConfig(String.valueOf(this.currentSessionId),
++                    storage);
              final SimulatedGetConfig sGetConfig = new SimulatedGetConfig(
-                 String.valueOf(currentSessionId), storage, initialConfigXMLFile);
+-                String.valueOf(currentSessionId), storage, Optional.absent());
+-            final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(currentSessionId));
+-            final SimulatedLock sLock = new SimulatedLock(String.valueOf(currentSessionId));
+-            final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(currentSessionId));
++                String.valueOf(this.currentSessionId), storage, Optional.absent());
++            final SimulatedCommit sCommit = new SimulatedCommit(String.valueOf(this.currentSessionId));
++            final SimulatedLock sLock = new SimulatedLock(String.valueOf(this.currentSessionId));
++            final SimulatedUnLock sUnlock = new SimulatedUnLock(String.valueOf(this.currentSessionId));
+             final SimulatedCreateSubscription sCreateSubs = new SimulatedCreateSubscription(
+-                String.valueOf(currentSessionId), Optional.absent());
++                String.valueOf(this.currentSessionId), Optional.absent());
+             final SimulatedDiscardChanges sDiscardChanges = new SimulatedDiscardChanges(
+-                String.valueOf(currentSessionId));
++                String.valueOf(this.currentSessionId));
+             return Sets.newHashSet(
+                 sGet, sGetConfig, sEditConfig, sCommit, sLock, sUnlock, sCreateSubs, sDiscardChanges);
+         }
 diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java
-index 0f19b117..3aafa005 100644
+index e5b197d..92f71fc 100644
 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java
 +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java
-@@ -9,21 +9,56 @@
+@@ -9,27 +9,62 @@
  package org.opendaylight.netconf.test.tool.rpc;
  
  import com.google.common.base.Optional;
++import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 +import java.io.File;
 +import java.io.IOException;
 +import java.util.Collections;
 +import java.util.List;
- import org.opendaylight.controller.config.util.xml.DocumentedException;
- import org.opendaylight.controller.config.util.xml.XmlElement;
- import org.opendaylight.controller.config.util.xml.XmlUtil;
+ import org.opendaylight.netconf.api.xml.XmlElement;
  import org.opendaylight.netconf.api.xml.XmlNetconfConstants;
- import org.opendaylight.netconf.confignetconfconnector.operations.AbstractConfigNetconfOperation;
+ import org.opendaylight.netconf.api.xml.XmlUtil;
+ import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  import org.w3c.dom.Document;
  import org.w3c.dom.Element;
 +import org.xml.sax.SAXException;
  
- public class SimulatedGet extends AbstractConfigNetconfOperation {
+ public class SimulatedGet extends AbstractLastNetconfOperation {
  
      private final DataList storage;
-+    private static final Logger LOG = LoggerFactory
-+            .getLogger(SimulatedGet.class);
++    private static final Logger LOG = LoggerFactory.getLogger(SimulatedGet.class);
  
 -    public SimulatedGet(final String netconfSessionIdForReporting, final DataList storage) {
 +    public SimulatedGet(final String netconfSessionIdForReporting, final DataList storage,
-+                              final Optional<File> initialConfigXMLFile) {
-         super(null, netconfSessionIdForReporting);
++            final Optional<File> initialConfigXMLFile) {
+         super(netconfSessionIdForReporting);
 -        this.storage = storage;
 +
 +        if (initialConfigXMLFile.isPresent()) {
-+            LOG.info("File is present: {}", initialConfigXMLFile.get()
-+                    .getName());
++            LOG.info("File is present: {}", initialConfigXMLFile.get().getName());
 +            this.storage = loadInitialConfigXMLFile(initialConfigXMLFile.get());
 +        } else {
 +            this.storage = storage;
 +        }
 +    }
 +
++    @SuppressFBWarnings(value = "DLS_DEAD_LOCAL_STORE")
 +    private DataList loadInitialConfigXMLFile(final File file) {
 +        LOG.info("Loading initial config xml file: {}", file.getName());
 +        DataList configData = new DataList();
@@ -75,3 +359,59 @@ index 0f19b117..3aafa005 100644
      }
  
      @Override
+     protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) {
+         final Element element = XmlUtil.createElement(document, XmlNetconfConstants.DATA_KEY, Optional.absent());
+-        for (final XmlElement e : storage.getConfigList()) {
++        for (final XmlElement e : this.storage.getConfigList()) {
+             final Element domElement = e.getDomElement();
+             element.appendChild(element.getOwnerDocument().importNode(domElement, true));
+         }
+diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConnectionPortTrail.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConnectionPortTrail.java
+new file mode 100644
+index 0000000..551eb71
+--- /dev/null
++++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConnectionPortTrail.java
+@@ -0,0 +1,42 @@
++/*
++ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
++ *
++ * This program and the accompanying materials are made available under the
++ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
++ * and is available at http://www.eclipse.org/legal/epl-v10.html
++ */
++package org.opendaylight.netconf.test.tool.rpc;
++
++import org.opendaylight.netconf.api.DocumentedException;
++import org.opendaylight.netconf.api.xml.XmlElement;
++import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation;
++import org.w3c.dom.Document;
++import org.w3c.dom.Element;
++
++public class SimulatedGetConnectionPortTrail extends AbstractLastNetconfOperation {
++
++    public SimulatedGetConnectionPortTrail(final String netconfSessionIdForReporting) {
++        super(netconfSessionIdForReporting);
++    }
++
++    @Override
++    protected Element handleWithNoSubsequentOperations(Document document, XmlElement operationElement)
++            throws DocumentedException {
++        Element portname = document.createElement("port-name");
++        portname.appendChild(document.createTextNode("L1"));
++        Element circuitpackname = document.createElement("circuit-pack-name");
++        circuitpackname.appendChild(document.createTextNode("2/0"));
++        Element ports = document.createElement("ports");
++        ports.setAttribute("xmlns", "http://org/openroadm/device");
++        ports.appendChild(portname);
++        ports.appendChild(circuitpackname);
++        return ports;
++    }
++
++    @Override
++    protected String getOperationName() {
++        return "get-connection-port-trail";
++    }
++
++
++}
index ef87b264d8af7bdfc8a4f2359835c76c74761140..389dc84155e13323a6e8c09939ab28cdb3205b5b 100755 (executable)
@@ -9,7 +9,7 @@
 # opts="${opts} --ssh tcp"
 # opts="${opts} --notification-file notif.xml"
 
-java -jar ./netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.3.1-executable.jar \
+java -jar ./netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.5.0-SNAPSHOT-executable.jar \
      --schemas-dir schemas \
      --initial-config-xml-file sample_configs/ord_1.2.1/sample-config-ROADM.xml \
      ${opts}
index aa39b9bb44db6612585c0b6aba6454ac1dad7f47..b2df50ac552a5863e1e156a36b76983f924da1a9 100644 (file)
@@ -30,7 +30,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
     @classmethod
     def __start_testtools(cls):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
-                      "netconf-testtool-1.3.1-executable.jar")
+                      "netconf-testtool-1.5.0-SNAPSHOT-executable.jar")
         if os.path.isfile(executable):
             with open('testtools1.log', 'w') as outfile:
                 cls.testtools_process1 = subprocess.Popen(
index 02e5a0a06d57c630881b83c342967773526294dd..bdca8f8d99e987ef4a6811d626b489f733304c12 100644 (file)
@@ -30,7 +30,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def __start_testtools(cls):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
-                      "netconf-testtool-1.3.1-executable.jar")
+                      "netconf-testtool-1.5.0-SNAPSHOT-executable.jar")
         if os.path.isfile(executable):
             if not os.path.exists("transportpce_tests/log"):
                 os.makedirs("transportpce_tests/log")
index 3407c504abc678467483c1f654ef09376b8fc58f..248eddd1cef47f5faad08da097ac0c11d1fd011e 100644 (file)
@@ -32,7 +32,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def __start_testtools(cls):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
-                      "netconf-testtool-1.3.1-executable.jar")
+                      "netconf-testtool-1.5.0-SNAPSHOT-executable.jar")
         if os.path.isfile(executable):
             if not os.path.exists("transportpce_tests/log"):
                 os.makedirs("transportpce_tests/log")