Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Implementation of HTTPS support for VFC-vnflcm project interface
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
pub
/
config
/
config.py
diff --git
a/lcm/lcm/pub/config/config.py
b/lcm/lcm/pub/config/config.py
index
b625255
..
41f0eed
100644
(file)
--- a/
lcm/lcm/pub/config/config.py
+++ b/
lcm/lcm/pub/config/config.py
@@
-11,11
+11,12
@@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
# [MSB]
# [MSB]
+MSB_SERVICE_PROTOCOL = 'http'
MSB_SERVICE_IP = '127.0.0.1'
MSB_SERVICE_IP = '127.0.0.1'
-MSB_SERVICE_PORT = '80'
+MSB_SERVICE_PORT = '443'
+MSB_BASE_URL = "%s://%s:%s" % (MSB_SERVICE_PROTOCOL, MSB_SERVICE_IP, MSB_SERVICE_PORT)
# [REDIS]
REDIS_HOST = '127.0.0.1'
# [REDIS]
REDIS_HOST = '127.0.0.1'
@@
-29,18
+30,35
@@
DB_NAME = "gvnfm"
DB_USER = "gvnfm"
DB_PASSWD = "gvnfm"
DB_USER = "gvnfm"
DB_PASSWD = "gvnfm"
+# [MDC]
+SERVICE_NAME = "vnflcm"
+FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
+ "HTTP_X_FORWARDED_SERVER"]
+
+# [aai config]
+AAI_BASE_URL = "http://127.0.0.1:80/aai/v13"
+AAI_USER = "AAI"
+AAI_PASSWD = "AAI"
+
# [register]
REG_TO_MSB_WHEN_START = True
# [register]
REG_TO_MSB_WHEN_START = True
-REG_TO_MSB_REG_URL = "/openoapi/microservices/v1/services"
+SSL_ENABLED = "true"
+REG_TO_MSB_REG_URL = "/api/microservices/v1/services"
+if SSL_ENABLED == "true":
+ enable_ssl = "true"
+else:
+ enable_ssl = "false"
REG_TO_MSB_REG_PARAM = {
"serviceName": "vnflcm",
"version": "v1",
REG_TO_MSB_REG_PARAM = {
"serviceName": "vnflcm",
"version": "v1",
- "url": "/openoapi/vnflcm/v1",
+ "enable_ssl": enable_ssl,
+ "url": "/api/vnflcm/v1",
"protocol": "REST",
"visualRange": "1",
"nodes": [{
"ip": "127.0.0.1",
"protocol": "REST",
"visualRange": "1",
"nodes": [{
"ip": "127.0.0.1",
- "port": "8
703
",
+ "port": "8
801
",
"ttl": 0
}]
}
"ttl": 0
}]
}
+MSB_SVC_URL = "/api/microservices/v1/services/vnflcm/version/v1"