From: Sam Hague <shague@redhat.com>
Date: Fri, 4 Dec 2015 13:43:32 +0000 (+0000)
Subject: Merge "OVSDB QoS - move QoS and Queue lists to OVSDB Node"
X-Git-Tag: release/beryllium-sr2~235
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=59e9f3a873e1b002d31a3c33532085ebfa761f1b;hp=6c9afef4a20f381758bcf3a3a47a08b77998842f;p=netvirt.git

Merge "OVSDB QoS - move QoS and Queue lists to OVSDB Node"
---

diff --git a/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/workaround/NetvirtSfcWorkaroundOF13Provider.java b/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/workaround/NetvirtSfcWorkaroundOF13Provider.java
index b3b43a6fdc..cbd14b48eb 100644
--- a/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/workaround/NetvirtSfcWorkaroundOF13Provider.java
+++ b/openstack/net-virt-sfc/impl/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/sfc/workaround/NetvirtSfcWorkaroundOF13Provider.java
@@ -280,7 +280,7 @@ public class NetvirtSfcWorkaroundOF13Provider implements INetvirtSfcOF13Provider
         if (ovsdbNode != null) {
             OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class);
             if (ovsdbNodeAugmentation != null && ovsdbNodeAugmentation.getOpenvswitchOtherConfigs() != null) {
-                southbound.getOtherConfig(ovsdbNode, OvsdbTables.OPENVSWITCH, TUNNEL_ENDPOINT_KEY);
+                local_ip = southbound.getOtherConfig(ovsdbNode, OvsdbTables.OPENVSWITCH, TUNNEL_ENDPOINT_KEY);
             }
 
         }
diff --git a/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection b/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection
index 262ec0f108..9a08d17937 100755
--- a/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection
+++ b/resources/commons/Ovsdb-HwvtepSouthbound-Collection.json.postman_collection
@@ -13,6 +13,10 @@
         "e25f67e4-3a3f-5da7-f7c8-41b371156719",
         "f7d33d50-7c8e-69e2-6d60-5c6155c5d210",
         "233b5ab5-8177-4416-6912-2477520a0654",
+        "567d7827-628d-07a4-3b95-5a208a244c43",
+        "f906c48b-ba3c-a3da-36e8-34c453538e2e",
+        "5d0c4d49-44f7-4165-ca5f-00cf2a9fca8b",
+        "34167a78-7de4-91a9-ef40-7592b28ead5c",
         "9bc22ca7-049c-af51-7c12-6bf71044b2ec",
         "f6d300f7-380a-d090-0d4a-2b2ddefe5104",
         "f9f71d74-a49d-b190-d929-b6772ce0ba73",
@@ -21,7 +25,8 @@
         "c8e8f3fd-3bfb-aafa-e3ec-a671a942f426",
         "d362ddc4-1c5f-67d5-e354-c2a8d2ba9d79",
         "538c71b3-e3e6-f01b-cc4c-d2b686686aa8",
-        "a13e6877-997e-84e1-c8e8-e83ef5e9a002"
+        "a13e6877-997e-84e1-c8e8-e83ef5e9a002",
+        "3c86ab7c-a7ee-6b71-3ec1-da7d20f97d1a"
     ],
     "owner":0,
     "sharedWithTeam":false,
@@ -312,6 +317,99 @@
             "preRequestScript": "",
             "tests": "",
             "rawModeData": ""
+        },
+        {
+            "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8",
+            "id": "567d7827-628d-07a4-3b95-5a208a244c43",
+            "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+            "url": "http://{{controllerHost}}:8181/restconf/config/network-topology:network-topology/topology/hwvtep:1/node/hwvtep:%2F%2F{{hwvtepNodeIp}}:6640%2Fphysicalswitch%2Fbr0",
+            "preRequestScript": "",
+            "pathVariables": {},
+            "method": "POST",
+            "data": [],
+            "dataMode": "raw",
+            "version": 2,
+            "tests": "",
+            "currentHelper": "normal",
+            "helperAttributes": {},
+            "time": 1448641495086,
+            "name": "Create Specific Config Physical Port",
+            "description": "",
+            "rawModeData": "{\n  \"network-topology:termination-point\": [\n        {\n            \"tp-id\": \"port0\",\n          \t\"hwvtep-node-name\": \"port0\",\n            \"hwvtep-node-description\": \"\",\n            \"vlan-bindings\": [\n          \t\t{\n                  \"vlan-id-key\": \"100\",\n                  \"logical-switch-ref\": \"ls0\"\n            \t}\n          \t]\n\t\t}\n    ]\n}"
+        },
+        {
+            "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8",
+            "id": "f906c48b-ba3c-a3da-36e8-34c453538e2e",
+            "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+            "url": "http://{{controllerHost}}:8181/restconf/config/network-topology:network-topology/topology/hwvtep:1/node/hwvtep:%2F%2F{{hwvtepNodeIp}}:6640%2Fphysicalswitch%2Fbr0/termination-point/port0",
+            "preRequestScript": "",
+            "pathVariables": {},
+            "method": "PUT",
+            "data": [],
+            "dataMode": "raw",
+            "version": 2,
+            "tests": "",
+            "currentHelper": "normal",
+            "helperAttributes": {},
+            "time": 1448643757985,
+            "name": "Update Specific Config Physical Port",
+            "description": "",
+            "rawModeData": "{\n  \"network-topology:termination-point\": [\n        {\n            \"tp-id\": \"port0\",\n          \t\"hwvtep-node-name\": \"port0\",\n            \"hwvtep-node-description\": \"\",\n            \"vlan-bindings\": [\n          \t\t{\n                  \"vlan-id-key\": \"100\",\n                  \"logical-switch-ref\": \"ls0\"\n            \t}\n          \t]\n\t\t}\n    ]\n}"
+        },
+        {
+            "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8",
+            "id": "5d0c4d49-44f7-4165-ca5f-00cf2a9fca8b",
+            "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+            "url": "http://{{controllerHost}}:8181/restconf/config/network-topology:network-topology/topology/hwvtep:1/node/hwvtep:%2F%2F{{hwvtepNodeIp}}:6640%2Fphysicalswitch%2Fbr0/termination-point/port0",
+            "preRequestScript": "",
+            "pathVariables": {},
+            "method": "GET",
+            "data": [],
+            "dataMode": "params",
+            "version": 2,
+            "tests": "",
+            "currentHelper": "normal",
+            "helperAttributes": {},
+            "time": 1448643846609,
+            "name": "Get Specific Config Physical Port",
+            "description": ""
+        },
+        {
+            "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8",
+            "id": "34167a78-7de4-91a9-ef40-7592b28ead5c",
+            "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+            "url": "http://{{controllerHost}}:8181/restconf/config/network-topology:network-topology/topology/hwvtep:1/node/hwvtep:%2F%2F{{hwvtepNodeIp}}:6640%2Fphysicalswitch%2Fbr0/termination-point/port0",
+            "preRequestScript": "",
+            "pathVariables": {},
+            "method": "DELETE",
+            "data": [],
+            "dataMode": "raw",
+            "version": 2,
+            "tests": "",
+            "currentHelper": "normal",
+            "helperAttributes": {},
+            "time": 1448643860663,
+            "name": "Delete Specific Config Physical Port",
+            "description": "",
+            "rawModeData": ""
+        },
+        {
+            "collectionId": "19f6b1a8-4d54-62f8-6bd6-f52e0b6e40b8",
+            "id": "3c86ab7c-a7ee-6b71-3ec1-da7d20f97d1a",
+            "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
+            "url": "http://{{controllerHost}}:8181/restconf/operational/network-topology:network-topology/topology/hwvtep:1/node/hwvtep:%2F%2F{{hwvtepNodeIp}}:6640%2Fphysicalswitch%2Fbr0/termination-point/port0",
+            "preRequestScript": "",
+            "pathVariables": {},
+            "method": "GET",
+            "data": [],
+            "dataMode": "params",
+            "version": 2,
+            "tests": "",
+            "currentHelper": "normal",
+            "helperAttributes": {},
+            "time": 1448718837283,
+            "name": "Get Specific Operational Physical Port",
+            "description": ""
         }
     ]
 }