aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2018-08-09 09:39:22 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2018-08-09 09:52:44 +0800
commit2775c0454c820eeffb30dfe202ca648947dd5730 (patch)
treeabd38887e6019183133e42ba85ecd6b2af5d562a
parent4c712deca1b73cfd7c5e2a672f0fdbf9ff5fb9a3 (diff)
Refactor codes for vfc-nfvo-lcm
Delete useless config variables Change-Id: Ifa89ba9ec788a5f05d7f7b3405ed04a0a8d6d09e Issue-ID: VFC-1009 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r--lcm/pub/config/config.py12
-rw-r--r--lcm/settings.py8
2 files changed, 0 insertions, 20 deletions
diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py
index 131ccdb0..ebffddca 100644
--- a/lcm/pub/config/config.py
+++ b/lcm/pub/config/config.py
@@ -11,16 +11,11 @@
# 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_SERVICE_IP = '10.0.14.1'
MSB_SERVICE_PORT = '80'
-# [IMAGE LOCAL PATH]
-ROOT_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-IMAGE_ROOT_PATH = os.path.join(ROOT_PATH, "/VmNfvo/VnfProduct")
-
# [REDIS]
REDIS_HOST = '127.0.0.1'
REDIS_PORT = '6379'
@@ -54,13 +49,6 @@ REG_TO_MSB_REG_PARAM = {
}]
}
-# delete image from vim option when delete csar
-IGNORE_DEL_IMG_WEHN_DEL_CSAR = True
-
-# catalog path(values is defined in settings.py)
-CATALOG_ROOT_PATH = None
-CATALOG_URL_PATH = None
-
# [aai config]
AAI_BASE_URL = "http://10.0.14.1:80/aai/v11"
AAI_USER = "AAI"
diff --git a/lcm/settings.py b/lcm/settings.py
index 67711bb9..969d0375 100644
--- a/lcm/settings.py
+++ b/lcm/settings.py
@@ -123,14 +123,6 @@ TIME_ZONE = 'UTC'
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.6/howto/static-files/
-STATIC_URL = '/static/'
-
-STATICFILES_DIRS = [
- os.path.join(BASE_DIR, "static")
-]
-
-pub_config.CATALOG_ROOT_PATH = os.path.join(STATICFILES_DIRS[0], "catalog")
-pub_config.CATALOG_URL_PATH = "static/catalog"
pub_config.AAI_BASE_URL = "http://%s:%s/aai/v11" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)
pub_config.SDC_BASE_URL = "http://%s:%s/api" % (pub_config.MSB_SERVICE_IP, pub_config.MSB_SERVICE_PORT)