From: Guillaume Lambert <guillaume.lambert@orange.com>
Date: Fri, 21 Apr 2023 14:03:06 +0000 (+0000)
Subject: Merge "Add functional tests for regenerator type"
X-Git-Tag: 8.0.0~51
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=f2d880c000de212be9868dbdaf9c8beab7a81045;hp=d9d6bea5b8ee420183152c3d8c7a8a355b1a904b

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 76fb5b0f6..368e81c13 100644
--- 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 1fadbabe3..207497da8 100644
--- 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 58ccf122c..4911c2a3f 100644
--- 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']