[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, 2 insertions, 0 deletions

diff --git a/onap-client/onap_client/so/service_instance.py b/onap-client/onap_client/so/service_instance.py
index 5441d84..2b1774d 100644
--- a/onap-client/onap_client/so/service_instance.py
+++ b/onap-client/onap_client/so/service_instance.py
@@ -194,12 +194,14 @@ def delete_service_instance(service_instance_name, api_type="GR_API", oc=None):
     si_id = si.get("service-instance-id")
     invariant_id = si.get("service-data").get("service-information").get("onap-model-information").get("model-invariant-uuid")
     version = si.get("service-data").get("service-information").get("onap-model-information").get("model-version")
+    version_id = si.get("service-data").get("service-information").get("onap-model-information").get("model-uuid")
 
     return oc.so.service_instantiation.delete_service_instance(
         service_invariant_id=invariant_id,
         service_name=service_instance_name,
         service_version=version,
         service_instance_id=si_id,
+        service_model_version_id=version_id,
         api_type=api_type,
     ).response_data