Fix bgpcep lsp test

Change-Id: I9b6ec9e8c5063ae95ba55d357e8a7bc90da631a2
Signed-off-by: tomas.markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
index bc975f35ece3922fdb3a4304f8b0e0326fa4ed35..226b6a9e95e29ddb88c76ece678dffb80898bb07 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
+++ b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
@@ -36,8 +36,6 @@ ${BGP_PEER_OPTIONS}    &>${BGP_PEER_LOG_FILE}
 ${DEFAULT_RIB_CHECK_PERIOD}    1s
 ${DEFAULT_RIB_CHECK_TIMEOUT}    10s
 ${BGP_PEER_LOG_LEVEL}    debug
-${ODL_LOG_LEVEL}    INFO
-${ODL_BGP_LOG_LEVEL}    DEFAULT
 ${JSONKEYSTR}     "linkstate-route"
 ${BGP_PEER_NAME}    example-bgp-peer
 ${DEVICE_NAME}    controller-config
@@ -130,6 +128,3 @@ Setup_Everything
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/fastbgp/play.py
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
     KarafKeywords.Setup_Karaf_Keywords
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_LOG_LEVEL}
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.bgpcep
-    KarafKeywords.Execute_Controller_Karaf_Command_On_Background    log:set ${ODL_BGP_LOG_LEVEL} org.opendaylight.protocol

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in.fluorine/data.json b/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/data.json
similarity index 82%
rename from csit/variables/bgpuser/lsp/effective_rib_in.fluorine/data.json
rename to csit/variables/bgpuser/lsp/effective_rib_in.oxygen/data.json
index 1d7e68e23d9e1d7ebb273940b58f1a99b2498daa..6cca8d7311e5821a9aac546a201df456281afb56 100644 (file)
--- a/csit/variables/bgpuser/lsp/effective_rib_in.fluorine/data.json
+++ b/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/data.json
@@ -2,19 +2,20 @@
     "bgp-linkstate:linkstate-routes": {
         "linkstate-route": [
             {
-                "path-id": 0,
-                "route-key": "[0, 5, 0, 21, 7, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 0, 1, 0, 1, 5, 6, 7, 8]",
-                "tunnel-id": 1,
+                "route-key": "AAUAFQcAAAAAAAAAAQECAwQAAQABBQYHCA==",
                 "lsp-id": 1,
                 "ipv4-tunnel-endpoint-address": "5.6.7.8",
                 "ipv4-tunnel-sender-address": "1.2.3.4",
+                "tunnel-id": 1,
+                "protocol-id": "bgp-epe",
+                "identifier": 1,
                 "attributes": {
-                    "ipv4-next-hop": {
-                        "global": "192.0.2.1"
-                    },
                     "origin": {
                         "value": "igp"
                     },
+                    "local-pref": {
+                        "pref": 100
+                    },
                     "as-path": {
                         "segments": [
                             {
@@ -24,12 +25,10 @@
                             }
                         ]
                     },
-                    "local-pref": {
-                        "pref": 100
+                    "ipv4-next-hop": {
+                        "global": "192.0.2.1"
                     }
-                },
-                "identifier": 1,
-                "protocol-id": "bgp-epe"
+                }
             }
         ]
     }

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in.fluorine/location.uri b/csit/variables/bgpuser/lsp/effective_rib_in.oxygen/location.uri
similarity index 100%
rename from csit/variables/bgpuser/lsp/effective_rib_in.fluorine/location.uri
rename to csit/variables/bgpuser/lsp/effective_rib_in.oxygen/location.uri

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in/data.json b/csit/variables/bgpuser/lsp/effective_rib_in/data.json
index 6cca8d7311e5821a9aac546a201df456281afb56..1d7e68e23d9e1d7ebb273940b58f1a99b2498daa 100644 (file)
--- a/csit/variables/bgpuser/lsp/effective_rib_in/data.json
+++ b/csit/variables/bgpuser/lsp/effective_rib_in/data.json
@@ -2,20 +2,19 @@
     "bgp-linkstate:linkstate-routes": {
         "linkstate-route": [
             {
-                "route-key": "AAUAFQcAAAAAAAAAAQECAwQAAQABBQYHCA==",
+                "path-id": 0,
+                "route-key": "[0, 5, 0, 21, 7, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 0, 1, 0, 1, 5, 6, 7, 8]",
+                "tunnel-id": 1,
                 "lsp-id": 1,
                 "ipv4-tunnel-endpoint-address": "5.6.7.8",
                 "ipv4-tunnel-sender-address": "1.2.3.4",
-                "tunnel-id": 1,
-                "protocol-id": "bgp-epe",
-                "identifier": 1,
                 "attributes": {
+                    "ipv4-next-hop": {
+                        "global": "192.0.2.1"
+                    },
                     "origin": {
                         "value": "igp"
                     },
-                    "local-pref": {
-                        "pref": 100
-                    },
                     "as-path": {
                         "segments": [
                             {
@@ -25,10 +24,12 @@
                             }
                         ]
                     },
-                    "ipv4-next-hop": {
-                        "global": "192.0.2.1"
+                    "local-pref": {
+                        "pref": 100
                     }
-                }
+                },
+                "identifier": 1,
+                "protocol-id": "bgp-epe"
             }
         ]
     }