summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhongyuzhao <zhao.hongyu@zte.com.cn>2019-08-13 15:21:48 +0800
committerhongyuzhao <zhao.hongyu@zte.com.cn>2019-08-16 12:04:44 +0800
commit8020d45b7bb4cd43c69425ea9c4bb1d88b250e4e (patch)
treecbd92ef641625c8e531b627dd7226a2fe0264289
parent80cb678669e138e391e5e5467bef3d5322af5cb9 (diff)
fix bug for failure in creating subscriptions for vnfm
Change-Id: I96380f38ad680079de8261d93702d67eb475f4d3 Issue-ID: VFC-1484 Signed-off-by: hongyuzhao <zhao.hongyu@zte.com.cn>
-rw-r--r--lcm/lcm/pub/utils/notificationsutil.py89
-rw-r--r--lcm/lcm/pub/utils/tests.py12
2 files changed, 78 insertions, 23 deletions
diff --git a/lcm/lcm/pub/utils/notificationsutil.py b/lcm/lcm/pub/utils/notificationsutil.py
index fe0b6403..936cc5be 100644
--- a/lcm/lcm/pub/utils/notificationsutil.py
+++ b/lcm/lcm/pub/utils/notificationsutil.py
@@ -13,12 +13,15 @@
# limitations under the License.
import json
+import base64
+import sys
+import traceback
import logging
+import urllib.request
+import urllib.error
+import urllib.parse
import uuid
-
-import requests
-from requests.auth import HTTPBasicAuth
-from rest_framework import status
+import httplib2
from lcm.nf import const
from lcm.pub.database.models import SubscriptionModel
@@ -27,11 +30,16 @@ from lcm.pub.database.models import NetworkInstModel
from lcm.pub.database.models import PortInstModel
from lcm.pub.database.models import StorageInstModel
from lcm.pub.database.models import VNFCInstModel
+from lcm.pub.database.models import NfInstModel
from lcm.pub.utils.timeutil import now_time
from lcm.pub.utils.enumutil import enum
logger = logging.getLogger(__name__)
+rest_no_auth, rest_oneway_auth, rest_bothway_auth = 0, 1, 2
+HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT, HTTP_202_ACCEPTED = '200', '201', '204', '202'
+status_ok_list = [HTTP_200_OK, HTTP_201_CREATED, HTTP_204_NO_CONTENT, HTTP_202_ACCEPTED]
+HTTP_404_NOTFOUND, HTTP_403_FORBIDDEN, HTTP_401_UNAUTHORIZED, HTTP_400_BADREQUEST = '404', '403', '401', '400'
NOTIFY_TYPE = enum(
lCM_OP_OCC="VnfLcmOperationOccurrenceNotification",
CREATION="VnfIdentifierCreationNotification",
@@ -63,23 +71,65 @@ class NotificationsUtil(object):
auth_info = json.loads(subscription.auth_info)
if const.BASIC in auth_info["authType"]:
try:
- self.post_notification(callbackUri, auth_info, notification)
+ self.post_notification(callbackUri, notification)
except Exception as e:
logger.error("Failed to post notification: %s", e.args[0])
- def post_notification(self, callbackUri, auth_info, notification):
- params = auth_info.get("paramsBasic", {})
- username = params.get("userName")
- password = params.get("password")
+ def post_notification(self, callbackUri, notification):
logger.info("Sending notification to %s", callbackUri)
- resp = requests.post(
- callbackUri,
- data=notification,
- headers={'content-type': 'application/json'},
- auth=HTTPBasicAuth(username, password)
- )
- if resp.status_code != status.HTTP_204_NO_CONTENT:
- logger.error("Notify %s failed: %s", callbackUri, resp.text)
+ resp = self.call_req(callbackUri, "", "", "POST", json.dumps(notification))
+ if resp[0] != 0:
+ logger.error('Status code is %s, detail is %s.', resp[2], resp[1])
+
+ def call_req(self, full_url, user, passwd, method, content=''):
+ callid = str(uuid.uuid1())
+ logger.debug("[%s]call_req('%s','%s','%s',%s,'%s','%s')" % (
+ callid, full_url, user, passwd, rest_no_auth, method, content))
+ ret = None
+ resp_Location = ''
+ resp_status = ''
+ try:
+ headers = {'content-type': 'application/json', 'accept': 'application/json'}
+ if user:
+ headers['Authorization'] = 'Basic %s' % base64.b64encode(
+ bytes('%s:%s' % (user, passwd), "utf-8")).decode()
+ ca_certs = None
+ for retry_times in range(3):
+ http = httplib2.Http(ca_certs=ca_certs, disable_ssl_certificate_validation=True)
+ http.follow_all_redirects = True
+ try:
+ resp, resp_content = http.request(full_url, method=method.upper(), body=content, headers=headers)
+ logger.info("resp=%s,resp_content=%s" % (resp, resp_content))
+ resp_status, resp_body = resp['status'], resp_content.decode('UTF-8')
+ resp_Location = resp.get('Location', "")
+ logger.debug("[%s][%d]status=%s,resp_body=%s)" % (callid, retry_times, resp_status, resp_body))
+ if resp_status in status_ok_list:
+ ret = [0, resp_body, resp_status, resp_Location]
+ else:
+ ret = [1, resp_body, resp_status, resp_Location]
+ break
+ except Exception as ex:
+ if 'httplib.ResponseNotReady' in str(sys.exc_info()):
+ logger.debug("retry_times=%d", retry_times)
+ logger.error(traceback.format_exc())
+ ret = [1, "Unable to connect to %s" % full_url, resp_status, resp_Location]
+ continue
+ raise ex
+ except urllib.error.URLError as err:
+ ret = [2, str(err), resp_status, resp_Location]
+ except Exception as ex:
+ logger.error(traceback.format_exc())
+ logger.error("[%s]ret=%s" % (callid, str(sys.exc_info())))
+ res_info = str(sys.exc_info())
+ if 'httplib.ResponseNotReady' in res_info:
+ res_info = "The URL[%s] request failed or is not responding." % full_url
+ ret = [3, res_info, resp_status, resp_Location]
+ except:
+ logger.error(traceback.format_exc())
+ ret = [4, str(sys.exc_info()), resp_status, resp_Location]
+
+ logger.debug("[%s]ret=%s" % (callid, str(ret)))
+ return ret
def set_affected_vnfcs(affected_vnfcs, nfinstid, changetype):
@@ -206,6 +256,11 @@ def prepare_notification(nfinstid, jobid, operation, operation_state):
}
}
}
+ nfInsts = NfInstModel.objects.filter(nfinstid=nfinstid)
+ if nfInsts.exists():
+ notification_content['vnfmInstId'] = nfInsts[0].vnfminstid
+ else:
+ notification_content['vnfmInstId'] = "1"
return notification_content
diff --git a/lcm/lcm/pub/utils/tests.py b/lcm/lcm/pub/utils/tests.py
index 3a2be7a5..55553441 100644
--- a/lcm/lcm/pub/utils/tests.py
+++ b/lcm/lcm/pub/utils/tests.py
@@ -21,7 +21,7 @@ import json
from . import syscomm
from . import timeutil
from . import values
-# import platform
+import codecs
from lcm.pub.database.models import JobStatusModel, JobModel, SubscriptionModel
from lcm.pub.utils.jobutil import JobUtil
@@ -271,19 +271,19 @@ class TestNotificationUtils(unittest.TestCase):
def tearDown(self):
SubscriptionModel.objects.all().delete()
- @mock.patch('requests.post')
+ @mock.patch('httplib2.Http.request')
def test_send_notification(self, mock_post):
dummy_notification = {
- "vnfInstanceId": "99442b18-a5c7-11e8-998c-bf1755941f13",
+ "vnfInstanceId": "9fe4080c-b1a3-11e8-bb96-645106374fd3",
"operationState": "STARTING",
"operation": "INSTANTIATE",
"_links": {}
}
- mock_post.return_value.status_code = 204
+ mock_post.return_value = ({"status": "204"}, codecs.encode("1234", encoding='utf-8'))
NotificationsUtil().send_notification(dummy_notification)
mock_post.assert_called_once()
- @mock.patch('requests.post')
+ @mock.patch('httplib2.Http.request')
def test_send_notification_with_empty_filters(self, mock_post):
dummy_notification = {
"vnfInstanceId": "9fe4080c-b1a3-11e8-bb96-645106374fd3",
@@ -291,7 +291,7 @@ class TestNotificationUtils(unittest.TestCase):
"operation": "",
"_links": {}
}
- mock_post.return_value.status_code = 204
+ mock_post.return_value = ({"status": "204"}, codecs.encode("1234", encoding='utf-8'))
NotificationsUtil().send_notification(dummy_notification)
mock_post.assert_called_once()