From: David López <david.lopez.munoz@ericsson.com>
Date: Tue, 29 Nov 2016 16:11:37 +0000 (+0100)
Subject: Generfy 'VPN Create L3VPN' with router-id
X-Git-Tag: release/boron-sr2~20
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e372d86817a2cf97e6f2bcc7be9aa09be96e1940;p=integration%2Ftest.git

Generfy 'VPN Create L3VPN' with router-id

Only if specified, it is used

Change-Id: I19e68422e4486c80bbc490cd4e237a74e5a6ca8d
Signed-off-by: David López <david.lopez.munoz@ericsson.com>
---

diff --git a/csit/libraries/VpnOperations.robot b/csit/libraries/VpnOperations.robot
index 7382d09a97..8c54061d3f 100644
--- a/csit/libraries/VpnOperations.robot
+++ b/csit/libraries/VpnOperations.robot
@@ -19,6 +19,8 @@ ${VAR_BASE}       ${CURDIR}/../variables/vpnservice/
 VPN Create L3VPN
     [Arguments]    &{Kwargs}
     [Documentation]    Create an L3VPN using the Json using the list of optional arguments received.
+    Run keyword if    "routerid" in ${Kwargs}    Collections.Set_To_Dictionary    ${Kwargs}    router=, "router-id":"${Kwargs['routerid']}"
+    ...    ELSE    Collections.Set_To_Dictionary    ${Kwargs}    router=${empty}
     &{L3vpn_create_actual_val} =    Collections.Copy_Dictionary    ${L3VPN_CREATE_DEFAULT}
     Collections.Set_To_Dictionary    ${L3vpn_create_actual_val}    &{Kwargs}
     TemplatedRequests.Post_As_Json_Templated    folder=${VAR_BASE}/l3vpn_create    mapping=${L3vpn_create_actual_val}    session=session
diff --git a/csit/variables/vpnservice/l3vpn_create/post_data.json b/csit/variables/vpnservice/l3vpn_create/post_data.json
index 4f705090d6..7511509cce 100644
--- a/csit/variables/vpnservice/l3vpn_create/post_data.json
+++ b/csit/variables/vpnservice/l3vpn_create/post_data.json
@@ -14,6 +14,7 @@
                $importrt
             ,
             "tenant-id":"$tenantid"
+            $router
          }
       ]
    }