X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fhoneycomb%2FRouting.py;h=8d8f7f440134e035a7d090ab86b53c8078308259;hp=495e96e0fd60b94b551e61e8b661ebb0194156fe;hb=abd1c00c657242ac481526d7cccfb53b5a8d86bd;hpb=3d279e4d68bbd94024bf739e71c872f18822a65d

diff --git a/resources/libraries/python/honeycomb/Routing.py b/resources/libraries/python/honeycomb/Routing.py
index 495e96e0fd..8d8f7f4401 100644
--- a/resources/libraries/python/honeycomb/Routing.py
+++ b/resources/libraries/python/honeycomb/Routing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -46,7 +46,7 @@ class RoutingKeywords(object):
         :type node: dict
         :type path: str
         :type data: dict
-        :return: Content of response.
+        :returns: Content of response.
         :rtype: bytearray
         :raises HoneycombError: If the status code in response is not
         200 = OK.
@@ -98,11 +98,10 @@ class RoutingKeywords(object):
             protocol = "vpp-protocol-attributes"
 
         full_data = {
-            "routing-protocol": [
+            "control-plane-protocol": [
                 {
                     "name": name,
                     "description": "hc2vpp-csit test route",
-                    "enabled": "true",
                     "type": "static",
                     protocol: {
                         "primary-vrf": vrf
@@ -116,7 +115,7 @@ class RoutingKeywords(object):
             ]
         }
 
-        path = "/routing-protocol/{0}".format(name)
+        path = "/control-plane-protocol/hc2vpp-ietf-routing:static/{0}".format(name)
         return RoutingKeywords._set_routing_table_properties(
             node, path, full_data)
 
@@ -132,7 +131,7 @@ class RoutingKeywords(object):
         :rtype: bytearray
         """
 
-        path = "/routing-protocol/{0}".format(name)
+        path = "/control-plane-protocol/hc2vpp-ietf-routing:static/{0}".format(name)
         return RoutingKeywords._set_routing_table_properties(node, path)
 
     @staticmethod
@@ -150,17 +149,17 @@ class RoutingKeywords(object):
         :raises HoneycombError: If the operation fails.
         """
 
-        path = "/routing-protocol/{0}".format(name)
+        path = "/control-plane-protocol/hc2vpp-ietf-routing:static/{0}".format(name)
         status_code, resp = HcUtil.\
             get_honeycomb_data(node, "oper_routing_table", path)
 
         if status_code != HTTPCodes.OK:
             raise HoneycombError(
                 "Not possible to get operational information about the "
-                "classify tables. Status code: {0}.".format(status_code))
+                "routing tables. Status code: {0}.".format(status_code))
 
         data = RoutingKeywords.clean_routing_oper_data(
-            resp['routing-protocol'][0]['static-routes']
+            resp['control-plane-protocol'][0]['static-routes']
             ['hc2vpp-ietf-{0}-unicast-routing:{0}'.format(ip_version)]['route'])
 
         return data
@@ -219,21 +218,15 @@ class RoutingKeywords(object):
 
         interface = Topology.convert_interface_reference(
             node, interface, 'name')
-        interface_orig = interface
         interface = interface.replace('/', '%2F')
-        path = 'interface/' + interface
+        path = 'interface/' + interface + '/ipv6/ipv6-router-advertisements'
 
         if not slaac_data:
             status_code, _ = HcUtil.delete_honeycomb_data(
                 node, 'config_slaac', path)
         else:
             data = {
-                'interface': [
-                    {
-                        'name': interface_orig,
-                        'ipv6-router-advertisements': slaac_data
-                    }
-                ]
+                       'ipv6-router-advertisements': slaac_data
             }
 
             status_code, _ = HcUtil.put_honeycomb_data(
@@ -258,7 +251,7 @@ class RoutingKeywords(object):
         interface = Topology.convert_interface_reference(
             node, interface, 'name')
         interface = interface.replace('/', '%2F')
-        path = 'interface/' + interface
+        path = 'interface/' + interface + '/ipv6/ipv6-router-advertisements'
 
         status_code, resp = HcUtil.\
             get_honeycomb_data(node, "config_slaac", path)
@@ -268,7 +261,7 @@ class RoutingKeywords(object):
                 "Not possible to get operational information about SLAAC. "
                 "Status code: {0}.".format(status_code))
         try:
-            dict_of_str = resp['interface'][0][
+            dict_of_str = resp[
                 'hc2vpp-ietf-ipv6-unicast-routing:ipv6-router-advertisements']
             return {k: str(v) for k, v in dict_of_str.items()}
         except (KeyError, TypeError):