x/daisycloud-core
Code Issues Proposed changes

test build and run daisy on pike env

Browse Source 
Change-Id: Id2e2bc776751f9d4d4952ba641a10540f903409c
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
This commit is contained in:
Zhijiang Hu 2017-10-24 04:57:45 -04:00
parent 0a4e001cff
commit 3b19059841
7 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/kolla/prepare.sh
View File

@ -30,7 +30,7 @@ echo -e "[Service]\nMountFlags=shared\nEnvironmentFile=/etc/sysconfig/docker\nEx
systemctl daemon-reload systemctl daemon-reload
systemctl restart docker systemctl restart docker
systemctl enable docker systemctl enable docker
yum install -y python-docker-py yum install -y python2-docker
yum -y install ntp yum -y install ntp
systemctl enable ntpd.service systemctl enable ntpd.service

5
code/daisy/daisy/api/backends/kolla/config.py
View File

@ -236,7 +236,10 @@ def enable_neutron_backend(req, cluster_id, kolla_config):
'opendaylight_features': 'opendaylight_features':
"odl-dlux-core,odl-dluxapps-applications," "odl-dlux-core,odl-dluxapps-applications,"
"odl-mdsal-apidocs,odl-netvirt-openstack", "odl-mdsal-apidocs,odl-netvirt-openstack",
'opendaylight_restconf_port': "8087", 'opendaylight_restconf_port': "8088",
'opendaylight_restconf_port_backup': "8182",
'opendaylight_haproxy_restconf_port': "8087",
'opendaylight_haproxy_restconf_port_backup': "8181",
'opendaylight_leader_ip_address': ''} 'opendaylight_leader_ip_address': ''}
opendaylight_config['opendaylight_leader_ip_address'] =\ opendaylight_config['opendaylight_leader_ip_address'] =\
kolla_config['Odl_ips'].encode() kolla_config['Odl_ips'].encode()

4
doc/installation.md
View File

@ -1,8 +1,8 @@
## Build Daisy artifact ## Build Daisy artifact
``` ```
# cd tools # cd tools && ./daisy-compile-rpm.sh
# ./daisy-compile-rpm.sh (above run only once)
# cd ../make # cd ../make
# make allrpm # make allrpm
``` ```

14
test/tempest/daisy_tempest/v1/test_cinder_volume.py
View File

@ -174,10 +174,10 @@ class DaisyCinderVolumeTest(base.BaseDaisyTest):
'af47d81c-7ae4-4148-a801-b4a5c6a52074' 'af47d81c-7ae4-4148-a801-b4a5c6a52074'
self.assertRaisesMessage(client_exc.HTTPNotFound, self.assertRaisesMessage(client_exc.HTTPNotFound,
"404 Not Found\nThe resource could not be " "404 Not Found: The resource could not be "
"found.\n Role with identifier " "found.: Role with identifier "
"af47d81c-7ae4-4148-a801-b4a5c6a52074 not " "af47d81c-7ae4-4148-a801-b4a5c6a52074 not "
"found (HTTP 404)", "found (HTTP 404)",
self.add_cinder_volume, self.add_cinder_volume,
**self.cinder_volume_add_meta) **self.cinder_volume_add_meta)
del self.cinder_volume_add_meta['role_id'] del self.cinder_volume_add_meta['role_id']
@ -192,8 +192,8 @@ class DaisyCinderVolumeTest(base.BaseDaisyTest):
'test_driver' 'test_driver'
self.assertRaisesMessage(client_exc.HTTPBadRequest, self.assertRaisesMessage(client_exc.HTTPBadRequest,
"400 Bad Request\nvolume_driver test_driver " "400 Bad Request: volume_driver test_driver "
"is not supported\n (HTTP 400)", "is not supported (HTTP 400)",
self.add_cinder_volume, self.add_cinder_volume,
**self.cinder_volume_add_meta) **self.cinder_volume_add_meta)
del self.cinder_volume_add_meta['role_id'] del self.cinder_volume_add_meta['role_id']
@ -261,8 +261,8 @@ class DaisyCinderVolumeTest(base.BaseDaisyTest):
update_meta = {'volume_driver': 'test_driver'} update_meta = {'volume_driver': 'test_driver'}
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\nvolume_driver test_driver is not supported\n" "400 Bad Request: volume_driver test_driver is not supported"
" (HTTP 400)", " (HTTP 400)",
self.update_cinder_volume, cinder_volume_info.id, **update_meta) self.update_cinder_volume, cinder_volume_info.id, **update_meta)
self.delete_cinder_volume(cinder_volume_info.id) self.delete_cinder_volume(cinder_volume_info.id)

26
test/tempest/daisy_tempest/v1/test_logical_network.py
View File

@ -93,8 +93,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\n" "400 Bad Request: "
"Logic_network flat1 is not valid range.\n (HTTP 400)", "Logic_network flat1 is not valid range. (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
# STC-F-Daisy_Logical_Network-0002 # STC-F-Daisy_Logical_Network-0002
@ -145,8 +145,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
'routers': fake_router}) 'routers': fake_router})
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\nLogic network's subnets is all related " "400 Bad Request: Logic network's subnets is all related "
"with a router, it's not allowed.\n (HTTP 400)", "with a router, it's not allowed. (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
tmp_fake_router1 = copy.deepcopy(fake_router) tmp_fake_router1 = copy.deepcopy(fake_router)
@ -154,8 +154,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
fake_cluster.update({'routers': tmp_fake_router1}) fake_cluster.update({'routers': tmp_fake_router1})
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\nLogic network's subnets is all related with a " "400 Bad Request: Logic network's subnets is all related with a "
"router, it's not allowed.\n (HTTP 400)", "router, it's not allowed. (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
tmp_fake_router2 = copy.deepcopy(fake_router) tmp_fake_router2 = copy.deepcopy(fake_router)
@ -163,8 +163,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
fake_cluster.update({'routers': tmp_fake_router2}) fake_cluster.update({'routers': tmp_fake_router2})
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\n" "400 Bad Request: "
"Logic_network test is not valid range.\n (HTTP 400)", "Logic_network test is not valid range. (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
tmp_fake_router3 = copy.deepcopy(fake_router) tmp_fake_router3 = copy.deepcopy(fake_router)
@ -172,7 +172,7 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
fake_cluster.update({'routers': tmp_fake_router3}) fake_cluster.update({'routers': tmp_fake_router3})
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\nSubnet test is not valid range.\n (HTTP 400)", "400 Bad Request: Subnet test is not valid range. (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
self.private_network_delete() self.private_network_delete()
@ -191,8 +191,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
'logic_networks': tmp_fake_logical1}) 'logic_networks': tmp_fake_logical1})
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\n" "400 Bad Request: "
"Between floating ip range can not be overlap.\n (HTTP 400)", "Between floating ip range can not be overlap. (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
tmp_fake_logical2 = copy.deepcopy( tmp_fake_logical2 = copy.deepcopy(
@ -205,8 +205,8 @@ class TecsLogicalNetworkTest(base.BaseDaisyTest):
fake_cluster.update({'logic_networks': tmp_fake_logical2}) fake_cluster.update({'logic_networks': tmp_fake_logical2})
self.assertRaisesMessage( self.assertRaisesMessage(
client_exc.HTTPBadRequest, client_exc.HTTPBadRequest,
"400 Bad Request\nSubnet name segment is repetition.\n " "400 Bad Request: Subnet name segment is repetition."
"(HTTP 400)", " (HTTP 400)",
self.add_cluster, **fake_cluster) self.add_cluster, **fake_cluster)
self.private_network_delete() self.private_network_delete()

2
tools/setup/common/daisy_yum.sh
View File

@ -37,7 +37,7 @@ function yum_set
echo "creating epel yum repo, please wait for several seconds..." echo "creating epel yum repo, please wait for several seconds..."
yum install -y epel-release yum install -y epel-release
echo "creating openstack yum repo, please wait for several seconds..." echo "creating openstack yum repo, please wait for several seconds..."
yum install -y centos-release-openstack-ocata yum install -y centos-release-openstack-pike
} }
fi fi

10
tools/setup/install/install_func.sh
View File

@ -79,7 +79,7 @@ function kolla_install
systemctl daemon-reload systemctl daemon-reload
systemctl restart docker systemctl restart docker
systemctl enable docker systemctl enable docker
check_and_install_rpm python-docker-py check_and_install_rpm python2-docker
check_and_install_rpm ntp check_and_install_rpm ntp
systemctl enable ntpd.service systemctl enable ntpd.service
systemctl start ntpd.service systemctl start ntpd.service
@ -89,13 +89,13 @@ function kolla_install
check_and_install_rpm GitPython.noarch check_and_install_rpm GitPython.noarch
check_and_install_rpm python2-pbr.noarch check_and_install_rpm python2-pbr.noarch
check_and_install_rpm python2-oslo-config.noarch check_and_install_rpm python2-oslo-config.noarch
check_and_install_rpm python-six.noarch check_and_install_rpm python2-six.noarch
check_and_install_rpm python-beautifulsoup4.noarch check_and_install_rpm python-beautifulsoup4.noarch
check_and_install_rpm python2-setuptools.noarch check_and_install_rpm python2-setuptools.noarch
check_and_install_rpm python-jinja2 check_and_install_rpm python2-jinja2
imagebranch="ocata" imagebranch="pike"
imageversion="170811155446" imageversion="171031195331"
imageserver="http://120.24.17.215" imageserver="http://120.24.17.215"
imagedir="/var/lib/daisy/versionfile/kolla" imagedir="/var/lib/daisy/versionfile/kolla"
imagebakdir="/home/kolla_install/docker/" imagebakdir="/home/kolla_install/docker/"