datapath-windows: Rename hyper-v switch port and nic handlers

Functions such as OvsCreatePort are vague in regard to who creates it or
when. It wasn't a problem thus far, since the vports were created,
updated and destroyed from one place only (hyper-v switch part). But
now, with the netlink implementation of the vport commands, a part of
the vport is constructed by the netlink vport add, and the other part
is constructed by the hyper-v switch nic and port handlers.

This patch renames the hyper-v switch nic and port handlers, so that
they are now prefixed by "Hv" instead of "Ovs", in order to clarify
which of the functions are nic or port handlers. This will make more
clear the usages from netlink vport commands side and from hyper-v
switch side. It will also make more obvious which nic and port
functions are helper functions.

Signed-off-by: Samuel Ghinet <sghinet@cloudbasesolutions.com>
Co-authored-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
Acked-by: Ankur Sharma <ankursharma@vmware.com>
Acked-by: Eitan Eliahu <eliahue@vmware.com>
Acked-by: Nithin Raju <nithin@vmware.com>
Tested-by: Nithin Raju <nithin@vmware.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/datapath-windows/ovsext/Oid.c b/datapath-windows/ovsext/Oid.c
index a675347..487739f 100644 (file)
--- a/datapath-windows/ovsext/Oid.c
+++ b/datapath-windows/ovsext/Oid.c
@@ -161,13 +161,13 @@ OvsProcessSetOidPort(POVS_SWITCH_CONTEXT switchObject,
 
     switch(setInfo->Oid) {
     case OID_SWITCH_PORT_CREATE:
-        status = OvsCreatePort(switchObject, portParam);
+        status = HvCreatePort(switchObject, portParam);
         break;
     case OID_SWITCH_PORT_TEARDOWN:
-        OvsTeardownPort(switchObject, portParam);
+        HvTeardownPort(switchObject, portParam);
         break;
     case OID_SWITCH_PORT_DELETE:
-        OvsDeletePort(switchObject, portParam);
+        HvDeletePort(switchObject, portParam);
         break;
     default:
         break;
@@ -193,19 +193,19 @@ OvsProcessSetOidNic(POVS_SWITCH_CONTEXT switchObject,
 
     switch(setInfo->Oid) {
     case OID_SWITCH_NIC_CREATE:
-        status = OvsCreateNic(switchObject, nicParam);
+        status = HvCreateNic(switchObject, nicParam);
         break;
     case OID_SWITCH_NIC_CONNECT:
-        OvsConnectNic(switchObject, nicParam);
+        HvConnectNic(switchObject, nicParam);
         break;
     case OID_SWITCH_NIC_UPDATED:
-        OvsUpdateNic(switchObject, nicParam);
+        HvUpdateNic(switchObject, nicParam);
         break;
     case OID_SWITCH_NIC_DISCONNECT:
-        OvsDisconnectNic(switchObject, nicParam);
+        HvDisconnectNic(switchObject, nicParam);
         break;
     case OID_SWITCH_NIC_DELETE:
-        OvsDeleteNic(switchObject, nicParam);
+        HvDeleteNic(switchObject, nicParam);
         break;
     default:
         break;
@@ -518,12 +518,12 @@ OvsOidRequestCompleteSetInfo(POVS_SWITCH_CONTEXT switchObject,
 
         switch(setInfo->Oid) {
         case OID_SWITCH_PORT_CREATE:
-            OvsDeletePort(switchObject,
+            HvDeletePort(switchObject,
                          (PNDIS_SWITCH_PORT_PARAMETERS)origHeader);
             break;
 
         case OID_SWITCH_NIC_CREATE:
-            OvsDeleteNic(switchObject,
+            HvDeleteNic(switchObject,
                         (PNDIS_SWITCH_NIC_PARAMETERS)origHeader);
             break;
 

diff --git a/datapath-windows/ovsext/Vport.c b/datapath-windows/ovsext/Vport.c
index ca3bf45..7bcb16f 100644 (file)
--- a/datapath-windows/ovsext/Vport.c
+++ b/datapath-windows/ovsext/Vport.c
@@ -80,8 +80,8 @@ static NTSTATUS CreateNetlinkMesgForNetdev(POVS_VPORT_EXT_INFO info,
  * Functions implemented in relaton to NDIS port manipulation.
  */
 NDIS_STATUS
-OvsCreatePort(POVS_SWITCH_CONTEXT switchContext,
-              PNDIS_SWITCH_PORT_PARAMETERS portParam)
+HvCreatePort(POVS_SWITCH_CONTEXT switchContext,
+             PNDIS_SWITCH_PORT_PARAMETERS portParam)
 {
     POVS_VPORT_ENTRY vport;
     LOCK_STATE_EX lockState;
@@ -111,8 +111,8 @@ create_port_done:
 }
 
 VOID
-OvsTeardownPort(POVS_SWITCH_CONTEXT switchContext,
-                PNDIS_SWITCH_PORT_PARAMETERS portParam)
+HvTeardownPort(POVS_SWITCH_CONTEXT switchContext,
+               PNDIS_SWITCH_PORT_PARAMETERS portParam)
 {
     POVS_VPORT_ENTRY vport;
     LOCK_STATE_EX lockState;
@@ -138,8 +138,8 @@ OvsTeardownPort(POVS_SWITCH_CONTEXT switchContext,
 
 
 VOID
-OvsDeletePort(POVS_SWITCH_CONTEXT switchContext,
-              PNDIS_SWITCH_PORT_PARAMETERS portParam)
+HvDeletePort(POVS_SWITCH_CONTEXT switchContext,
+             PNDIS_SWITCH_PORT_PARAMETERS portParam)
 {
     POVS_VPORT_ENTRY vport;
     LOCK_STATE_EX lockState;
@@ -164,8 +164,8 @@ OvsDeletePort(POVS_SWITCH_CONTEXT switchContext,
  * Functions implemented in relaton to NDIS NIC manipulation.
  */
 NDIS_STATUS
-OvsCreateNic(POVS_SWITCH_CONTEXT switchContext,
-             PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvCreateNic(POVS_SWITCH_CONTEXT switchContext,
+            PNDIS_SWITCH_NIC_PARAMETERS nicParam)
 {
     POVS_VPORT_ENTRY vport;
     UINT32 portNo = 0;
@@ -236,8 +236,8 @@ done:
 
 /* Mark already created NIC as connected. */
 VOID
-OvsConnectNic(POVS_SWITCH_CONTEXT switchContext,
-              PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvConnectNic(POVS_SWITCH_CONTEXT switchContext,
+             PNDIS_SWITCH_NIC_PARAMETERS nicParam)
 {
     LOCK_STATE_EX lockState;
     POVS_VPORT_ENTRY vport;
@@ -282,8 +282,8 @@ done:
 }
 
 VOID
-OvsUpdateNic(POVS_SWITCH_CONTEXT switchContext,
-             PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvUpdateNic(POVS_SWITCH_CONTEXT switchContext,
+            PNDIS_SWITCH_NIC_PARAMETERS nicParam)
 {
     POVS_VPORT_ENTRY vport;
     LOCK_STATE_EX lockState;
@@ -356,8 +356,8 @@ update_nic_done:
 
 
 VOID
-OvsDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
-                 PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
+                PNDIS_SWITCH_NIC_PARAMETERS nicParam)
 {
     POVS_VPORT_ENTRY vport;
     UINT32 portNo = 0;
@@ -407,8 +407,8 @@ done:
 
 
 VOID
-OvsDeleteNic(POVS_SWITCH_CONTEXT switchContext,
-             PNDIS_SWITCH_NIC_PARAMETERS nicParam)
+HvDeleteNic(POVS_SWITCH_CONTEXT switchContext,
+            PNDIS_SWITCH_NIC_PARAMETERS nicParam)
 {
     LOCK_STATE_EX lockState;
     POVS_VPORT_ENTRY vport;

diff --git a/datapath-windows/ovsext/Vport.h b/datapath-windows/ovsext/Vport.h
index 7bad546..e606e1f 100644 (file)
--- a/datapath-windows/ovsext/Vport.h
+++ b/datapath-windows/ovsext/Vport.h
@@ -117,22 +117,22 @@ NDIS_STATUS OvsInitConfiguredSwitchNics(struct _OVS_SWITCH_CONTEXT *switchContex
 
 VOID OvsClearAllSwitchVports(struct _OVS_SWITCH_CONTEXT *switchContext);
 
-NDIS_STATUS OvsCreateNic(POVS_SWITCH_CONTEXT switchContext,
-                         PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-NDIS_STATUS OvsCreatePort(POVS_SWITCH_CONTEXT switchContext,
-                          PNDIS_SWITCH_PORT_PARAMETERS portParam);
-VOID OvsTeardownPort(POVS_SWITCH_CONTEXT switchContext,
-                     PNDIS_SWITCH_PORT_PARAMETERS portParam);
-VOID OvsDeletePort(POVS_SWITCH_CONTEXT switchContext,
-                   PNDIS_SWITCH_PORT_PARAMETERS portParam);
-VOID OvsConnectNic(POVS_SWITCH_CONTEXT switchContext,
-                   PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-VOID OvsUpdateNic(POVS_SWITCH_CONTEXT switchContext,
+NDIS_STATUS HvCreateNic(POVS_SWITCH_CONTEXT switchContext,
+                        PNDIS_SWITCH_NIC_PARAMETERS nicParam);
+NDIS_STATUS HvCreatePort(POVS_SWITCH_CONTEXT switchContext,
+                         PNDIS_SWITCH_PORT_PARAMETERS portParam);
+VOID HvTeardownPort(POVS_SWITCH_CONTEXT switchContext,
+                    PNDIS_SWITCH_PORT_PARAMETERS portParam);
+VOID HvDeletePort(POVS_SWITCH_CONTEXT switchContext,
+                  PNDIS_SWITCH_PORT_PARAMETERS portParam);
+VOID HvConnectNic(POVS_SWITCH_CONTEXT switchContext,
                   PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-VOID OvsDeleteNic(POVS_SWITCH_CONTEXT switchContext,
-                  PNDIS_SWITCH_NIC_PARAMETERS nicParam);
-VOID OvsDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
-                      PNDIS_SWITCH_NIC_PARAMETERS nicParam);
+VOID HvUpdateNic(POVS_SWITCH_CONTEXT switchContext,
+                 PNDIS_SWITCH_NIC_PARAMETERS nicParam);
+VOID HvDeleteNic(POVS_SWITCH_CONTEXT switchContext,
+                 PNDIS_SWITCH_NIC_PARAMETERS nicParam);
+VOID HvDisconnectNic(POVS_SWITCH_CONTEXT switchContext,
+                     PNDIS_SWITCH_NIC_PARAMETERS nicParam);
 
 static __inline BOOLEAN
 OvsIsTunnelVportType(OVS_VPORT_TYPE ovsType)