Commit 27ec6035 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NBI component: 

- Updated service endpoint settings custom resource key to /device/endpoint/settings
- Corrected test files
parent 022cd29d

src/nbi/service/rest_server/nbi_plugins/ietf_l3vpn/Handlers.py

+4 −2
Original line number Diff line number Diff line
@@ -91,8 +91,10 @@ def update_service_endpoint( 
            for (ip_range, ip_prefix_len, lan_tag), next_hop in static_routing.items()

        })



    ENDPOINT_SETTINGS_KEY = '/device[{:s}]/endpoint[{:s}]/vlan[{:d}]/settings'

    endpoint_settings_key = ENDPOINT_SETTINGS_KEY.format(device_uuid, endpoint_uuid, vlan_tag)

    #ENDPOINT_SETTINGS_KEY = '/device[{:s}]/endpoint[{:s}]/vlan[{:d}]/settings'

    #endpoint_settings_key = ENDPOINT_SETTINGS_KEY.format(device_uuid, endpoint_uuid, vlan_tag)

    ENDPOINT_SETTINGS_KEY = '/device[{:s}]/endpoint[{:s}]/settings'

    endpoint_settings_key = ENDPOINT_SETTINGS_KEY.format(device_uuid, endpoint_uuid)

    field_updates = {}

    if vlan_tag              is not None: field_updates['vlan_tag'        ] = (vlan_tag,              True)

    if ipv4_address          is not None: field_updates['ip_address'      ] = (ipv4_address,          True)

src/nbi/tests/data/ietf_l3vpn_req_svc2.json

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
                        "cascaded-lan-prefixes": {

                          "ipv4-lan-prefixes": [

                            {

                              "lan": "172.1.101.1/24",

                              "lan": "172.1.201.1/24",

                              "lan-tag": "vlan31",

                              "next-hop": "128.32.33.254"

                            }
@@ -145,7 +145,7 @@ 
                  "cascaded-lan-prefixes": {

                    "ipv4-lan-prefixes": [

                      {

                        "lan": "172.1.101.1/24",

                        "lan": "172.1.201.1/24",

                        "lan-tag": "vlan201",

                        "next-hop": "172.10.33.2"

                      }