From c1bce68549c3af891cdce051371f9b9c00f73da5 Mon Sep 17 00:00:00 2001
From: Jason Hunter <hunterjm@gmail.com>
Date: Fri, 27 Aug 2021 20:34:32 -0400
Subject: [PATCH] close connection on connection retry, bump onvif lib (#55363)

---
 homeassistant/components/onvif/device.py     | 1 +
 homeassistant/components/onvif/manifest.json | 6 +-----
 requirements_all.txt                         | 5 +----
 requirements_test_all.txt                    | 5 +----
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/homeassistant/components/onvif/device.py b/homeassistant/components/onvif/device.py
index 87b68508fa1980..9ebf87a4132e43 100644
--- a/homeassistant/components/onvif/device.py
+++ b/homeassistant/components/onvif/device.py
@@ -130,6 +130,7 @@ async def async_setup(self) -> bool:
                 err,
             )
             self.available = False
+            await self.device.close()
         except Fault as err:
             LOGGER.error(
                 "Couldn't connect to camera '%s', please verify "
diff --git a/homeassistant/components/onvif/manifest.json b/homeassistant/components/onvif/manifest.json
index 641497f52047c1..a7faa60cdcd4c0 100644
--- a/homeassistant/components/onvif/manifest.json
+++ b/homeassistant/components/onvif/manifest.json
@@ -2,11 +2,7 @@
   "domain": "onvif",
   "name": "ONVIF",
   "documentation": "https://www.home-assistant.io/integrations/onvif",
-  "requirements": [
-    "onvif-zeep-async==1.0.0",
-    "WSDiscovery==2.0.0",
-    "zeep[async]==4.0.0"
-  ],
+  "requirements": ["onvif-zeep-async==1.2.0", "WSDiscovery==2.0.0"],
   "dependencies": ["ffmpeg"],
   "codeowners": ["@hunterjm"],
   "config_flow": true,
diff --git a/requirements_all.txt b/requirements_all.txt
index 5dbfe7494ef28f..fe9979c28d2db0 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1100,7 +1100,7 @@ ondilo==0.2.0
 onkyo-eiscp==1.2.7
 
 # homeassistant.components.onvif
-onvif-zeep-async==1.0.0
+onvif-zeep-async==1.2.0
 
 # homeassistant.components.opengarage
 open-garage==0.1.5
@@ -2449,9 +2449,6 @@ youless-api==0.12
 # homeassistant.components.media_extractor
 youtube_dl==2021.04.26
 
-# homeassistant.components.onvif
-zeep[async]==4.0.0
-
 # homeassistant.components.zengge
 zengge==0.2
 
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index f73f8d63238f2a..013fae0eb266da 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -632,7 +632,7 @@ omnilogic==0.4.5
 ondilo==0.2.0
 
 # homeassistant.components.onvif
-onvif-zeep-async==1.0.0
+onvif-zeep-async==1.2.0
 
 # homeassistant.components.openerz
 openerz-api==0.1.0
@@ -1372,9 +1372,6 @@ yeelight==0.7.4
 # homeassistant.components.youless
 youless-api==0.12
 
-# homeassistant.components.onvif
-zeep[async]==4.0.0
-
 # homeassistant.components.zeroconf
 zeroconf==0.36.0