diff options
| -rwxr-xr-x | conf/admin-openrc.sh | 2 | ||||
| -rwxr-xr-x | juju/juju_launch.sh | 3 | ||||
| -rwxr-xr-x | open-o/openo_docker.sh | 4 | ||||
| -rw-r--r-- | opera/__init__.py | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | opera/deploy_vnf.py | 0 | ||||
| -rwxr-xr-x | opera/openo_connect.py | 18 | ||||
| -rw-r--r-- | process_conf.py | 5 |
7 files changed, 24 insertions, 8 deletions
diff --git a/conf/admin-openrc.sh b/conf/admin-openrc.sh index 1f3309f..bb0932c 100755 --- a/conf/admin-openrc.sh +++ b/conf/admin-openrc.sh @@ -3,6 +3,6 @@ export OS_USER_DOMAIN_NAME=default export OS_USERNAME=admin export OS_PASSWORD=console export OS_PROJECT_NAME=admin -export OS_AUTH_URL=http://192.168.104.222:5000/v3 +export OS_AUTH_URL=http://192.168.104.222:35357/v3 export OS_IDENTITY_API_VERSION=3 export OS_REGION_NAME=RegionOne diff --git a/juju/juju_launch.sh b/juju/juju_launch.sh index 2aff57e..766ebfe 100755 --- a/juju/juju_launch.sh +++ b/juju/juju_launch.sh @@ -78,7 +78,8 @@ function juju_client_prepare() $OS_REGION_NAME: endpoint: $OS_AUTH_URL' > clouds.yaml" - local cmd1="juju add-cloud openstack clouds.yaml --replace" + local cmd1="juju remove-cloud openstack; \ + juju add-cloud openstack clouds.yaml --replace" exec_cmd_on_client $cmd1 if [[ ! $(exec_cmd_on_client "juju list-clouds | grep openstack") ]]; then diff --git a/open-o/openo_docker.sh b/open-o/openo_docker.sh index 7cd6eb6..b857988 100755 --- a/open-o/openo_docker.sh +++ b/open-o/openo_docker.sh @@ -69,7 +69,7 @@ function docker_pull() do echo "Try again" done - until docker pull openoint/nfvo-driver-vnfm-juju + until docker pull huangxiangyu/nfvo-driver-vnfm-juju:$OPENO_VERSION do echo "Try again" done @@ -194,7 +194,7 @@ function docker_run() docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-sdnc-zte openoint/nfvo-driver-sdnc-zte:$OPENO_VERSION docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vim openoint/nfvo-driver-vim:$OPENO_VERSION docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-huawei openoint/nfvo-driver-vnfm-huawei:$OPENO_VERSION - docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-juju -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_PORT:8483 -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_MYSQL_PORT:3306 openoint/nfvo-driver-vnfm-juju + docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-juju -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_PORT:8483 -p $OPENO_IP:$NFVO_DRIVER_VNFM_JUJU_MYSQL_PORT:3306 huangxiangyu/nfvo-driver-vnfm-juju:$OPENO_VERSION docker run -d -e MSB_ADDR=$msb_ip --name nfvo-driver-vnfm-zte openoint/nfvo-driver-vnfm-zte:$OPENO_VERSION docker run -d -e MSB_ADDR=$msb_ip -e MYSQL_ADDR=$tosca_inventory_ip:3306 --name nfvo-lcm -p $OPENO_IP:8403:8403 openoint/nfvo-lcm:$OPENO_VERSION docker run -d -e MSB_ADDR=$msb_ip --name nfvo-resmanagement openoint/nfvo-resmanagement:$OPENO_VERSION diff --git a/opera/__init__.py b/opera/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/opera/__init__.py diff --git a/opera/deploy_vnf.py b/opera/deploy_vnf.py index b9703a0..b9703a0 100644..100755 --- a/opera/deploy_vnf.py +++ b/opera/deploy_vnf.py diff --git a/opera/openo_connect.py b/opera/openo_connect.py index 4e9e4fb..9412f72 100755 --- a/opera/openo_connect.py +++ b/opera/openo_connect.py @@ -13,6 +13,7 @@ import sys import os import time import requests +import re import json from datetime import datetime from pprint import pprint @@ -86,6 +87,19 @@ def get_vim_id(msb_ip, vim_type): return vimId +def get_vnfm_ip(msb_ip): + vnfm_url = 'http://' + msb_ip + '/openoapi/extsys/v1/vnfms/' + get_vnfm = request_get(vnfm_url) + vnfm_url = '' + for i in get_vnfm: + if i["type"] == "jujuvnfm": + vnfm_url = i["url"] + break + ip = re.compile("\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}") + vnfm_ip = re.findall(ip, vnfm_url)[0] + return vnfm_ip + + def add_openo_vim(msb_ip, auth_url): vim_url = 'http://' + msb_ip + '/openoapi/extsys/v1/vims/' vnfm_url = 'http://' + msb_ip + '/openoapi/extsys/v1/vnfms/' @@ -151,9 +165,11 @@ def upload_csar(msb_ip, package): files = {'file': open(package, 'rb')} res = requests.post(csar_url, files=files) if res.status_code != 200: - retry = 5 + retry = 10 while retry != 0: + time.sleep(5) delete_csars(msb_ip) + time.sleep(5) retry_res = requests.post(csar_url, files=files) if retry_res.status_code == 200: break diff --git a/process_conf.py b/process_conf.py index 976cf19..582163e 100644 --- a/process_conf.py +++ b/process_conf.py @@ -31,12 +31,11 @@ def generate_app_conf(openo_config, vnf_config, scripts_dir): """generate opera/work/scripts_dir/vnf.conf""" with open(scripts_dir + "/vnf.conf", "w") as fd: for i in vnf_config["vIMS"]: + fd.write('{0}={1}\n'.format('NS_PKG', i["ns_pkg"])) + fd.write('{0}={1}\n'.format('VNF_PKG', i["vnf_pkg"])) if i["type"] == openo_config["vnf_type"]: fd.write('{0}={1}\n'.format('VNF_TYPE', i["type"])) - fd.write('{0}={1}\n'.format('NS_PKG', i["ns_pkg"])) - fd.write('{0}={1}\n'.format('VNF_PKG', i["vnf_pkg"])) fd.write('{0}={1}'.format('NSDID', i["nsdId"])) - break if __name__ == "__main__": |