Merge pull request #8 from jean-edouard/vwif7

nwd: also update vwif backends

Author: rossphilipson

nwd/NetworkSlaveMethods.hs

@@ -30,6 +30,7 @@ import Data.Maybe
 import Data.Int
 import Data.Word
 import Data.Bits
+import Data.List
 import qualified Data.Map as M 
 import qualified Data.Text.Lazy as TL
 import Text.Printf
@@ -150,26 +151,52 @@ getVmNameFromUuid uuid =
 
 
 xsVifMac :: String -> String -> IO (Maybe String)
-xsVifMac gDomid gDevid = xsRead $ printf "/local/domain/%s/device/vif/%s/mac" gDomid gDevid
+xsVifMac gDomid gDevid = do
+    res <- xsRead $ printf "/local/domain/%s/device/vif/%s/mac" gDomid gDevid
+    case res of
+        Just _ -> return $ res
+	Nothing -> xsRead $ printf "/local/domain/%s/device/vwif/%s/mac" gDomid gDevid
 
 xsVifRemove :: String -> String -> IO ()
-xsVifRemove gDomid gDevid = xsRm $ printf "/local/domain/%s/device/vif/%s" gDomid gDevid
+xsVifRemove gDomid gDevid = do
+    xsRm $ printf "/local/domain/%s/device/vif/%s" gDomid gDevid
+    xsRm $ printf "/local/domain/%s/device/vwif/%s" gDomid gDevid
 
 xsBackendVifNode :: String -> String
 xsBackendVifNode = printf "/local/domain/%s/backend/vif" 
 
+xsBackendVwifNode :: String -> String
+xsBackendVwifNode = printf "/local/domain/%s/backend/vwif"
+
 xsVifNetwork :: String -> String -> String -> IO (Maybe String)
-xsVifNetwork domid devid backendDomid = xsRead $ printf "%s/%s/%s/bridge" (xsBackendVifNode backendDomid)  domid devid
---xsVifMac domid devid backendDomid = xsRead $ printf "%s/%s/%s/mac" (xsBackendVifNode backendDomid) domid devid
+xsVifNetwork domid devid backendDomid = do
+    vif <- xsRead $ printf "%s/%s/%s/bridge" (xsBackendVifNode backendDomid)  domid devid
+    case vif of
+        Just _ -> return $ vif
+        Nothing -> xsRead $ printf "%s/%s/%s/bridge" (xsBackendVwifNode backendDomid)  domid devid
 
 xsVifState :: String -> String -> String -> IO (Maybe String)
-xsVifState domid devid backendDomid = xsRead $ printf "%s/%s/%s/state" (xsBackendVifNode backendDomid)  domid devid
+xsVifState domid devid backendDomid = do
+    vif <- xsRead $ printf "%s/%s/%s/state" (xsBackendVifNode backendDomid)  domid devid
+    case vif of
+        Just _ -> return $ vif
+        Nothing -> xsRead $ printf "%s/%s/%s/state" (xsBackendVwifNode backendDomid)  domid devid
 
 xsVifFrontend :: String -> String -> String -> IO (Maybe String)
-xsVifFrontend domid devid backendDomid = xsRead $ printf "%s/%s/%s/frontend" (xsBackendVifNode backendDomid) domid devid
+xsVifFrontend domid devid backendDomid = do
+    vif <- xsRead $ printf "%s/%s/%s/frontend" (xsBackendVifNode backendDomid) domid devid
+    case vif of
+        Just _ -> return $ vif
+        Nothing -> xsRead $ printf "%s/%s/%s/frontend" (xsBackendVwifNode backendDomid) domid devid
+
+rmDups :: (Ord a) => [a] -> [a]
+rmDups = map head . group . sort
 
 xsGuestDomains :: String -> IO ([String])
-xsGuestDomains backendDomid = xsDir (xsBackendVifNode backendDomid)
+xsGuestDomains backendDomid = do
+    vifNodes <- xsDir (xsBackendVifNode backendDomid)
+    vwifNodes <- xsDir (xsBackendVwifNode backendDomid)
+    return $ rmDups (vifNodes ++ vwifNodes)
 
 xsDevIds :: String -> String -> IO ([String])
 xsDevIds backendDomid guestDomid = xsDir $ printf "%s/%s" (xsBackendVifNode backendDomid) guestDomid

nwd/XSWifi.hs

@@ -83,9 +83,18 @@ nm_802_11_AP_SEC_GROUP_CCMP = 0x80
 nm_802_11_AP_SEC_KEY_MGMT_PSK = 0x100
 nm_802_11_AP_SEC_KEY_MGMT_802_1X = 0x200
 
+-- Update guest nodes instead of stubdom nodes
+--   Note: this serves as a workaround for guest nodes not getting updated
+deStubdom :: String -> IO (DomainId)
+deStubdom domid = do
+    target <- xsRead ("/local/domain/" ++ domid ++ "/target")
+    case target of
+        Just x -> return (read x)
+        Nothing -> return (read domid)
+
 -- Query first, then export
-wifiXsQueryAndExport :: DomainId -> String -> DomainId -> Rpc ()
-wifiXsQueryAndExport slaveDomid slaveObj guestDomid= do -- info "exporting wifi information to xenstore"
+wifiXsQueryAndExport' :: DomainId -> String -> DomainId -> Rpc ()
+wifiXsQueryAndExport' slaveDomid slaveObj guestDomid = do -- info "exporting wifi information to xenstore"
     wifiQueryNm slaveDomid slaveObj >>= f 
         where 
             f Nothing     = liftIO $ do 
@@ -97,8 +106,13 @@ wifiXsQueryAndExport slaveDomid slaveObj guestDomid= do -- info "exporting wifi
                                wifiXsExportAp (activeApPath guestDomid) info
                                wifiXsExportFakeInfoAp guestDomid
 
-            activeApPath domid = "/local/domain/" ++ show guestDomid ++ "/wlan/0"
-            fakeInfoApPath domid = "/local/domain/" ++ show guestDomid ++ "/wlan/1"
+            activeApPath domid = "/local/domain/" ++ show domid ++ "/wlan/0"
+            fakeInfoApPath domid = "/local/domain/" ++ show domid ++ "/wlan/1"
+
+wifiXsQueryAndExport :: DomainId -> String -> DomainId -> Rpc ()
+wifiXsQueryAndExport slaveDomid slaveObj guestOrStubdomDomid = do
+    guestDomid <- liftIO $ deStubdom (show guestOrStubdomDomid)
+    wifiXsQueryAndExport' slaveDomid slaveObj guestDomid
 
 wifiQueryNm domid slaveNw =  do
     apInfo <- withNetworkSlave domid (NC.comCitrixXenclientNetworkConfigGetExtraInfo slaveService slaveNw)

nws/NetworkUtils.hs

@@ -127,7 +127,7 @@ listPhyInterfaces = catMaybes <$> (mapM isPhy =<< sysfsnetOrderedContents)
 isVifOrTunInterface :: FilePath -> IO (Bool)
 isVifOrTunInterface iface = do
     devtype <- strip <$> getFileContents (sysfsnet </> iface </> "device" </> "devtype")
-    return ((devtype =~ "vif" :: Bool) || (iface =~ "tap" :: Bool))
+    return ((devtype =~ "vif" :: Bool) || (devtype =~ "vwif" :: Bool) || (iface =~ "tap" :: Bool))
 
 isBridgeInterface :: String -> IO (Bool)
 isBridgeInterface iface =  doesDirectoryExist (sysfsnet </> iface </> "bridge")