From 3bb6cf4b938d3e725860606d3ddaa8eecd872151 Mon Sep 17 00:00:00 2001 From: DR695H Date: Thu, 20 Jun 2019 15:04:04 -0400 Subject: replace aai, closeloop, sdc with jinja Issue-ID: TEST-158 Change-Id: I95a783f26e28512cb4fc98e50931d62001c489c6 Signed-off-by: DR695H --- robot/resources/aai/ccvpn-vpn-bindings.robot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'robot/resources/aai/ccvpn-vpn-bindings.robot') diff --git a/robot/resources/aai/ccvpn-vpn-bindings.robot b/robot/resources/aai/ccvpn-vpn-bindings.robot index c139f7cc..67789e27 100644 --- a/robot/resources/aai/ccvpn-vpn-bindings.robot +++ b/robot/resources/aai/ccvpn-vpn-bindings.robot @@ -3,19 +3,18 @@ Documentation Operations on vpn-bindings in AAI for CCVPN use case, ... using earliest API version where changes are implemented and ... latest API version where changes are not implemented -Resource ../json_templater.robot Resource aai_interface.robot Resource api_version_properties.robot Resource add-relationship-list.robot Library OperatingSystem Library Collections - +Library ONAPLibrary.Templating *** Variables *** ${AAI_VPNB_ROOT_PATH} /network/vpn-bindings/vpn-binding ${AAI_VPNB_EXAMPLES_PATH} /examples/vpn-bindings ${AAI_VPNB_NODES_PATH} /nodes/vpn-bindings -${AAI_ADD_VPNBINDING_BODY}= robot/assets/templates/aai/add-vpn-binding.template +${AAI_ADD_VPNBINDING_BODY}= aai/add-vpn-binding.jinja ${AAI_VPNB_API_NA_INDEX_PATH}= ${AAI_BEIJING_INDEX_PATH} ${AAI_VPNB_API_IMPL_INDEX_PATH}= ${AAI_CASABLANCA_INDEX_PATH} @@ -31,7 +30,8 @@ Create VPN Binding [Documentation] Creates VPN Binding in AAI [Arguments] ${vpn_id} ${arguments}= Create Dictionary vpn_id=${vpn_id} - ${data}= Fill JSON Template File ${AAI_ADD_VPNBINDING_BODY} ${arguments} + Create Environment aai ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Apply Template aai ${AAI_ADD_VPNBINDING_BODY} ${arguments} ${put_resp}= Run A&AI Put Request ${AAI_VPNB_API_IMPL_INDEX_PATH}${AAI_VPNB_ROOT_PATH}/${vpn_id} ${data} ${status_string}= Convert To String ${put_resp.status_code} Should Match Regexp ${status_string} ^(201|200)$ -- cgit 1.2.3-korg