Merge "Add functional tests for regenerator type"

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/service/ServiceTypes.java b/common/src/main/java/org/opendaylight/transportpce/common/service/ServiceTypes.java
index 76fb5b0f6810befe663628fa36e75a44485bbdbd..368e81c13397db7929638a2c7235ecb88945b582 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/service/ServiceTypes.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/service/ServiceTypes.java
@@ -30,6 +30,9 @@ public final class ServiceTypes {
                 if (Uint32.valueOf(100).equals(serviceRate)) {
                     return StringConstants.SERVICE_TYPE_100GE_T;
                 }
+                if (Uint32.valueOf(400).equals(serviceRate)) {
+                    return StringConstants.SERVICE_TYPE_400GE;
+                }
                 LOG.warn("Invalid service-rate {}", serviceRate);
                 return null;
 

diff --git a/lighty/src/main/assembly/resources/config_template.json b/lighty/src/main/assembly/resources/config_template.json
index 1fadbabe3c9aa4cb8a3e2482e388d0a6ea6d2270..207497da8de35aa84abcdbd0a7c2085f2a97142c 100644 (file)
--- a/lighty/src/main/assembly/resources/config_template.json
+++ b/lighty/src/main/assembly/resources/config_template.json
@@ -1,6 +1,7 @@
 {
     "restconf":{
         "inetAddress": "127.0.0.1",
-        "httpPort": ODL_RESTCONF_PORT
+        "httpPort": ODL_RESTCONF_PORT,
+        "restconfServletContextPath":"/rests"
     }
 }

diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py
index 58ccf122c22ba3c10bb8cea6586a96f495e0d348..4911c2a3ff9d10595d78548afb5742ec2aaf65dc 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -59,8 +59,6 @@ else:
 
 RESTCONF_PATH_PREFIX = {'rfc8040': '/rests',
                         'draft-bierman02': '/restconf'}
-if 'USE_LIGHTY' in os.environ and os.environ['USE_LIGHTY'] == 'True':
-    RESTCONF_PATH_PREFIX['rfc8040'] = '/restconf'
 
 if 'USE_ODL_RESTCONF_VERSION' in os.environ:
     RESTCONF_VERSION = os.environ['USE_ODL_RESTCONF_VERSION']