summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-01-19 10:05:25 +0800
committeryangyan <yangyanyj@chinamobile.com>2020-01-19 10:05:34 +0800
commit1927708c03f343d60fb39506faed3abf130e226e (patch)
tree269754896ad31a717edbc413cf1ce99017367c01 /lcm
parent16099ce3041c8caf2b4b4b696b7fc191b6665c84 (diff)
Fix the vnflcm problem of registering MSB with HTTPS
Change-Id: I76aa32ea42e76a48049032e40139c7a4e5dbab1b Issue-ID: VFC-1502 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/biz/create_subscription.py4
-rw-r--r--lcm/lcm/nf/const.py4
-rw-r--r--lcm/lcm/pub/config/config.py3
-rw-r--r--lcm/lcm/pub/utils/restcall.py4
4 files changed, 8 insertions, 7 deletions
diff --git a/lcm/lcm/nf/biz/create_subscription.py b/lcm/lcm/nf/biz/create_subscription.py
index 5f981d0a..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__)
@@ -122,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):
diff --git a/lcm/lcm/nf/const.py b/lcm/lcm/nf/const.py
index e961bb3e6..1d584b87 100644
--- a/lcm/lcm/nf/const.py
+++ b/lcm/lcm/nf/const.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-from lcm.pub.config import config
+from lcm.pub.config.config import MSB_BASE_URL
from lcm.pub.utils.jobutil import enum
HEAL_ACTION_TYPE = enum(
@@ -142,7 +142,7 @@ CHANGE_TYPE = enum(
RESOURCE_MAP = {'Storage': 'volumn', 'Network': 'network', 'SubNetwork': 'subnet', 'Port': 'port',
'Flavour': 'flavor', 'Vm': 'vm'}
-URL_PREFIX = "http://%s:%s/api/vnflcm/v1" % (config.MSB_SERVICE_IP, config.MSB_SERVICE_PORT)
+URL_PREFIX = "%s/api/vnflcm/v1" % (MSB_BASE_URL)
ROOT_URI = "api/vnflcm/v1/subscriptions/"
diff --git a/lcm/lcm/pub/config/config.py b/lcm/lcm/pub/config/config.py
index 5023aefa..27896d06 100644
--- a/lcm/lcm/pub/config/config.py
+++ b/lcm/lcm/pub/config/config.py
@@ -14,7 +14,8 @@
# [MSB]
MSB_SERVICE_IP = '127.0.0.1'
-MSB_SERVICE_PORT = '80'
+MSB_SERVICE_PORT = '443'
+MSB_BASE_URL = "https://%s:%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
# [REDIS]
REDIS_HOST = '127.0.0.1'
diff --git a/lcm/lcm/pub/utils/restcall.py b/lcm/lcm/pub/utils/restcall.py
index 08c33c55..8a9010c2 100644
--- a/lcm/lcm/pub/utils/restcall.py
+++ b/lcm/lcm/pub/utils/restcall.py
@@ -20,7 +20,7 @@ import urllib.error
import uuid
import httplib2
-from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT
+from lcm.pub.config.config import MSB_BASE_URL
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'
@@ -81,7 +81,7 @@ def call_req(base_url, user, passwd, auth_type, resource, method, content='', ad
def req_by_msb(resource, method, content=''):
- base_url = "http://%s:%s/" % (MSB_SERVICE_IP, MSB_SERVICE_PORT)
+ base_url = MSB_BASE_URL
return call_req(base_url, "", "", rest_no_auth, resource, method, content)