Sweetcomb global cleanup

-Merge IETF and Openconfig to use SCVPP 2
-Move L2 bridge from sc_vpp_interface to sc_vpp_v3po
-Implement tav2 dump
-Make openconfig-interfaces functions static
-Try one more dispatch after failure in VAPI_CALL
-Add error return code for scvpp
-Remove unused length maccros
-Return appropriate error code for interface dump when interface not found
-Improve scvpp test suite
-Change get_interface_id prototype
-Use interface_dump_iface in openconfig_interface.
-No more vapi types in openconfig_interfaces.c
-Move openconfig_local_routing VAPI operations to sc_vpp_ip
-Implement a multiple dump with a stack data structure
-Comment out state_cb code from openconfig_local_routing to use new
functions later.
-Rename YANG model to their fully qualified name : <module>@<revision>
-Remove headers almost empty and put registration declaration in
sc_model.h
-Shorten vapi context global variable name
-Reorganize scvpp unit test suite
-Add instructions to Makefile to install/uninstall YANG models in sysrepo.
-Add this new instructions to README.md.
-Reimplement interface_dump_all
-Use a common message at INFO Log Level to know when sysrepo callbacks
are triggered
-Remove old structure to perform dump of all interfaces
-Reimplement get_interface_name and add scvpp test for it
-Clean sys_util
-Use UNUSED maccro everywhere to have lighter prototypes
-Have ietf-interfaces:interfaces-state work with new dump function
-Add setup and teardown for NAT tests
-Remove unused tapv2 dump
-Remove useless sysrepo module callback
-Remove xpath_find_first_key usage in openconfig-interfaces
-Remove xpath_find_first_key in oc_local_routing and in the rest of
sweetcomb
-Reorganize scvpp include dir and fix scvpp_test new warnings
-Fix scvpp tests for ip routes
-Factorize scvpp nat and test return code of its function
-Correct test_dump_if_all if there is an existing hardware interface
-Implement a per-prefix dump in scvpp
-free changes iterator in ietf-interfaces
-Add new XPATH in oc local-routing
-Introduce helper methods for sysrepo config callbacks
-Factorize config callback
-Refactor the openconfig-local-routing config callback
-Use common foreach_change to iterate over changes in all models
-Create a sample directory gathering example of configurations supposed
to work with sweetcomb
-Fix state callback of oc-local-routing
-Add new sample for get operation on next-hop
-foreach_elt maccro condition forgets to read one element

Change-Id: I8e87fce577a00337977588f057a6e095a20f457c
Signed-off-by: YohanPipereau <ypiperea@cisco.com>

1 files changed, 31 insertions, 20 deletions

diff --git a/src/scvpp/tests/scvpp_nat_test.c b/src/scvpp/tests/scvpp_nat_test.c
index fae9615..044102e 100644
--- a/src/scvpp/tests/scvpp_nat_test.c
+++ b/src/scvpp/tests/scvpp_nat_test.c
@@ -20,36 +20,37 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-#include "scvpp_nat_test.h"
-#include "sc_vpp_comm.h"
-#include "sc_vpp_nat.h"
+#include "scvpp_test.h"
 
-void test_nat44_static_mapping(__attribute__((unused)) void **state)
+#include <scvpp/comm.h>
+#include <scvpp/nat.h>
+
+
+void test_nat44_static_mapping(void **state)
 {
+    UNUSED(state);
     nat44_add_del_static_mapping_t map = {0};
     nat44_static_mapping_details_t dump = {0};
     u8 empty_ip[4] = {0};
+    int rc;
 
     /*Configure the static mapping
       Alternative to this CLI command:
       nat44 add static mapping local 172.168.0.1 external 172.168.8.5
      */
-
     sc_aton("172.168.0.1", map.local_ip_address,
             sizeof(map.local_ip_address));
-
     sc_aton("172.168.8.5", map.external_ip_address,
             sizeof(map.external_ip_address));
-
     map.addr_only = 1;
-
     map.external_sw_if_index = ~0;
-
     map.is_add = 1;
 
-    nat44_add_del_static_mapping(&map);
+    rc = nat44_add_del_static_mapping(&map);
+    assert_int_equal(rc, SCVPP_OK);
 
-    nat44_static_mapping_dump(&dump);
+    rc = nat44_static_mapping_dump(&dump);
+    assert_int_equal(rc, SCVPP_OK);
 
     assert_int_equal(dump.addr_only, map.addr_only);
 
@@ -62,11 +63,13 @@ void test_nat44_static_mapping(__attribute__((unused)) void **state)
     /* Remove previous config*/
     map.is_add = 0;
 
-    nat44_add_del_static_mapping(&map);
+    rc = nat44_add_del_static_mapping(&map);
+    assert_int_equal(rc, SCVPP_OK);
 
     memset(&dump, 0, sizeof(dump));
 
-    nat44_static_mapping_dump(&dump);
+    rc = nat44_static_mapping_dump(&dump);
+    assert_int_equal(rc, SCVPP_OK);
 
     assert_int_equal(dump.addr_only, 0);
 
@@ -77,14 +80,16 @@ void test_nat44_static_mapping(__attribute__((unused)) void **state)
                         sizeof(dump.external_ip_address));
 }
 
-void test_nat44_static_mapping_with_ports(__attribute__((unused)) void **state)
+void test_nat44_static_mapping_with_ports(void **state)
 {
+    UNUSED(state);
     nat44_add_del_static_mapping_t map = {0};
     nat44_static_mapping_details_t dump = {0};
     nat44_add_del_address_range_t range = {0};
     u8 empty_ip[4] = {0};
     const u16 lport = 77;
     const u16 eport = 88;
+    int rc;
 
     /*Configure address pool
      Alternative to this CLI:
@@ -98,7 +103,8 @@ void test_nat44_static_mapping_with_ports(__attribute__((unused)) void **state)
 
     range.is_add = 1;
 
-    nat44_add_del_addr_range(&range);
+    rc = nat44_add_del_addr_range(&range);
+    assert_int_equal(rc, SCVPP_OK);
 
     /*Configure NAT with ports
      Alternative to this CLI:
@@ -122,9 +128,11 @@ void test_nat44_static_mapping_with_ports(__attribute__((unused)) void **state)
 
     map.is_add = 1;
 
-    nat44_add_del_static_mapping(&map);
+    rc = nat44_add_del_static_mapping(&map);
+    assert_int_equal(rc, SCVPP_OK);
 
-    nat44_static_mapping_dump(&dump);
+    rc = nat44_static_mapping_dump(&dump);
+    assert_int_equal(rc, SCVPP_OK);
 
     assert_int_equal(dump.addr_only, map.addr_only);
 
@@ -142,11 +150,13 @@ void test_nat44_static_mapping_with_ports(__attribute__((unused)) void **state)
 
     map.is_add = 0;
 
-    nat44_add_del_static_mapping(&map);
+    rc = nat44_add_del_static_mapping(&map);
+    assert_int_equal(rc, SCVPP_OK);
 
     memset(&dump, 0, sizeof(dump));
 
-    nat44_static_mapping_dump(&dump);
+    rc = nat44_static_mapping_dump(&dump);
+    assert_int_equal(rc, SCVPP_OK);
 
     assert_int_equal(dump.addr_only, 0);
 
@@ -162,7 +172,8 @@ void test_nat44_static_mapping_with_ports(__attribute__((unused)) void **state)
 
     range.is_add = 0;
 
-    nat44_add_del_addr_range(&range);
+    rc = nat44_add_del_addr_range(&range);
+    assert_int_equal(rc, SCVPP_OK);
 }
 
 const struct CMUnitTest nat_tests[] = {