set all timeouts necessary (0a0cb1dd) · Commits · OCF / sdk

opencapif_sdk/capif_event_feature.py

+9 −3

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ class capif_invoker_event_feature(capif_invoker_connector):
		response = requests.post(
		url=path,
		json=payload,
		timeout=10,
		headers={"Content-Type": "application/json"},
		cert=(self.signed_key_crt_path, self.private_key_path),
		verify=os.path.join(self.invoker_folder, "ca.crt")
		@@ -123,7 +124,8 @@ class capif_invoker_event_feature(capif_invoker_connector):
		url=delete_path,
		headers={"Content-Type": "application/json"},
		cert=(self.signed_key_crt_path, self.private_key_path),
		verify=os.path.join(self.invoker_folder, "ca.crt")
		verify=os.path.join(self.invoker_folder, "ca.crt"),
		timeout=10
		)
		response.raise_for_status()

		@@ -186,7 +188,8 @@ class capif_invoker_event_feature(capif_invoker_connector):
		json=payload,
		headers={"Content-Type": "application/json"},
		cert=(self.signed_key_crt_path, self.private_key_path),
		verify=os.path.join(self.invoker_folder, "ca.crt")
		verify=os.path.join(self.invoker_folder, "ca.crt"),
		timeout=10
		)
		response.raise_for_status()

		@@ -240,6 +243,7 @@ class capif_provider_event_feature(capif_provider_connector):
		response = requests.post(
		url=path,
		json=payload,
		timeout=10,
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt")
		@@ -318,7 +322,8 @@ class capif_provider_event_feature(capif_provider_connector):
		url=delete_path,
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt")
		verify=os.path.join(self.provider_folder, "ca.crt"),
		timeout=10
		)
		response.raise_for_status()

		@@ -391,6 +396,7 @@ class capif_provider_event_feature(capif_provider_connector):
		response = requests.put(
		url=put_path,
		json=payload,
		timeout=10,
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt")

opencapif_sdk/capif_logging_feature.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,7 @@ class capif_logging_feature:
		response = requests.post(
		url=path,
		json=payload,
		timeout=10,
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt")

opencapif_sdk/capif_provider_connector.py

+12 −3

Original line number	Diff line number	Diff line
		@@ -304,6 +304,7 @@ class capif_provider_connector:
		response = requests.post(
		url,
		headers=headers,
		timeout=10,
		data=json.dumps(payload),
		verify=os.path.join(self.provider_folder, "ca.crt"),
		)
		@@ -362,7 +363,8 @@ class capif_provider_connector:
		headers={"Content-Type": "application/json"},
		auth=HTTPBasicAuth(self.capif_provider_username,
		self.capif_provider_password),
		verify=False
		verify=False,
		timeout=10
		)
		response.raise_for_status()

		@@ -537,6 +539,7 @@ class capif_provider_connector:
		data=json.dumps(data),
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt"),
		timeout=10
		)
		response.raise_for_status()
		self.logger.info("Services published successfully")
		@@ -638,6 +641,7 @@ class capif_provider_connector:
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt"),
		timeout=10,
		)

		response.raise_for_status()
		@@ -754,6 +758,7 @@ class capif_provider_connector:
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt"),
		timeout=10
		)

		response.raise_for_status()
		@@ -975,6 +980,7 @@ class capif_provider_connector:
		response = requests.put(
		url,
		headers={"Content-Type": "application/json"},
		timeout=10,
		data=json.dumps(data),
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt"),
		@@ -1079,7 +1085,8 @@ class capif_provider_connector:
		response = requests.delete(
		url,
		cert=cert_paths,
		verify=os.path.join(self.provider_folder, "ca.crt")
		verify=os.path.join(self.provider_folder, "ca.crt"),
		timeout=10
		)

		response.raise_for_status()
		@@ -1258,6 +1265,7 @@ class capif_provider_connector:
		response = requests.put(
		url,
		headers=headers,
		timeout=10,
		data=json.dumps(payload),
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt"),
		@@ -1393,7 +1401,8 @@ class capif_provider_connector:
		url,
		headers={"Content-Type": "application/json"},
		cert=cert,
		verify=os.path.join(self.provider_folder, "ca.crt")
		verify=os.path.join(self.provider_folder, "ca.crt"),
		timeout=10
		)
		response.raise_for_status()
		return response.json()

opencapif_sdk/service_discoverer.py

+11 −5

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ class service_discoverer:
		self.capif_invoker_username = capif_invoker_username
		self.capif_host = capif_host
		self.capif_https_port = capif_https_port
		self.token = ""
		self.token = "" # nosec
		if supported_features is None:
		supported_features = 0
		self.supported_features = supported_features
		@@ -121,8 +121,9 @@ class service_discoverer:
		try:
		self.token = self.invoker_capif_details["access_token"]

		except:
		pass
		except KeyError:
		self.token = None
		self.logger.debug("'access_token' not found in invoker_capif_details")

		# Define paths for certificates, private keys, and CA root
		self.signed_key_crt_path = os.path.join(self.invoker_folder, self.invoker_capif_details["user_name"] + ".crt")
		@@ -236,7 +237,9 @@ class service_discoverer:
		url,
		json=payload,
		cert=(self.signed_key_crt_path, self.private_key_path),
		verify=self.ca_root_path)
		verify=self.ca_root_path,
		timeout=10
		)
		response.raise_for_status()
		self.logger.info("Security context correctly updated")

		@@ -295,7 +298,8 @@ class service_discoverer:
		json=payload,
		cert=(self.signed_key_crt_path,
		self.private_key_path),
		verify=self.ca_root_path
		verify=self.ca_root_path,
		timeout=10
		)
		response.raise_for_status()
		self.logger.info("Security service properly registered")
		@@ -338,6 +342,7 @@ class service_discoverer:
		response = requests.post(url,
		headers=headers,
		data=payload,
		timeout=10,
		cert=(self.signed_key_crt_path,
		self.private_key_path),
		verify=self.ca_root_path
		@@ -375,6 +380,7 @@ class service_discoverer:
		response = requests.get(
		url,
		headers={"Content-Type": "application/json"},
		timeout=10,
		cert=(self.signed_key_crt_path, self.private_key_path),
		verify=self.ca_root_path
		)