diff options
Diffstat (limited to 'lcm/lcm/nf/biz/create_subscription.py')
-rw-r--r-- | lcm/lcm/nf/biz/create_subscription.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lcm/lcm/nf/biz/create_subscription.py b/lcm/lcm/nf/biz/create_subscription.py index 2b1f6064..e999d6ed 100644 --- a/lcm/lcm/nf/biz/create_subscription.py +++ b/lcm/lcm/nf/biz/create_subscription.py @@ -27,7 +27,7 @@ from lcm.pub.database.models import SubscriptionModel from lcm.pub.exceptions import NFLCMException from lcm.pub.exceptions import NFLCMExceptionSeeOther from lcm.pub.utils.values import ignore_case_get -from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT +from lcm.pub.config.config import MSB_BASE_URL logger = logging.getLogger(__name__) @@ -53,14 +53,15 @@ class CreateSubscription: def check_callbackuri_connection(self): logger.debug("SubscribeNotification-post::> Sending GET request " "to %s" % self.callback_uri) - try: - response = requests.get(self.callback_uri, timeout=2) - if response.status_code != status.HTTP_204_NO_CONTENT: - raise NFLCMException("callbackUri %s returns %s status " - "code." % (self.callback_uri, response.status_code)) - except Exception: - raise NFLCMException("callbackUri %s didn't return 204 status" - "code." % self.callback_uri) + retry_count = 3 + while retry_count > 0: + response = requests.get(self.callback_uri, timeout=10) + if response.status_code == status.HTTP_204_NO_CONTENT: + return + logger.debug("callbackUri %s returns %s status code." % (self.callback_uri, response.status_code)) + retry_count = - 1 + + raise NFLCMException("callbackUri %s didn't return 204 status." % self.callback_uri) def do_biz(self): self.subscription_id = str(uuid.uuid4()) @@ -121,7 +122,7 @@ class CreateSubscription: for subscription in subscriptions: if self.check_filter_exists(subscription): links = json.loads(subscription.links) - raise NFLCMExceptionSeeOther("http://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, links["self"]["href"])) + raise NFLCMExceptionSeeOther("%s/%s" % (MSB_BASE_URL, links["self"]["href"])) return False def save_db(self): |