[VVP] Add urllib3 retry to OC requestsguilin

Adding retry to OC for requests.
- Retry limit is 3, back_off time is 2.5, 5, then 10 seconds for last retry.

Fixing an issue w/ delete SI payload.

Removing auto-generated X-Transaction-ID header from SDC requests.

Issue-ID: VVP-487
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I3eb2b3b65ce00307066867f65f2ef9a03f7d5524

1 files changed, 0 insertions, 21 deletions

diff --git a/onap-client/onap_client/sdc/catalog/vnf_catalog.py b/onap-client/onap_client/sdc/catalog/vnf_catalog.py
index b04b0f5..fe1a251 100644
--- a/onap-client/onap_client/sdc/catalog/vnf_catalog.py
+++ b/onap-client/onap_client/sdc/catalog/vnf_catalog.py
@@ -34,7 +34,6 @@
 # limitations under the License.
 #
 # ============LICENSE_END============================================
-import uuid
 from functools import partial
 
 from onap_client.sdc.client import SDCClient
@@ -71,7 +70,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "return_data": {"catalog_resource_id": ("uniqueId",)},
@@ -93,7 +91,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "return_data": {"catalog_resource_id": ("uniqueId",)},
@@ -121,7 +118,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -142,7 +138,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -161,7 +156,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -190,7 +184,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -219,7 +212,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -238,7 +230,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "return_data": {"catalog_resource_id": ("uniqueId",)},
@@ -258,7 +249,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -285,7 +275,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -304,7 +293,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "return_data": {"catalog_resource_id": ("uniqueId",)},
@@ -334,7 +322,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -355,7 +342,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -376,7 +362,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -405,7 +390,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -435,7 +419,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -454,7 +437,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -473,7 +455,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "return_data": {"catalog_resource_name": ("name",)},
@@ -493,7 +474,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "auth": self.auth,
@@ -511,7 +491,6 @@ class VNFCatalog(SDCClient):
                     "Accept": "application/json",
                     "Content-Type": "application/json",
                     "USER_ID": self.sdc_designer_user_id,
-                    "X-TransactionId": str(uuid.uuid4()),
                     "X-FromAppId": self.config.application_id,
                 },
                 "return_data": {"resources": ("resources",)},