diff options
Diffstat (limited to 'windriver')
| -rw-r--r-- | windriver/docker/build_image.sh | 4 | ||||
| -rw-r--r-- | windriver/pom.xml | 4 | ||||
| -rw-r--r-- | windriver/titanium_cloud/proxy/urls.py | 2 | ||||
| -rw-r--r-- | windriver/titanium_cloud/proxy/urlsV1.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh index 61bf8050..3151baeb 100644 --- a/windriver/docker/build_image.sh +++ b/windriver/docker/build_image.sh @@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.4.1-SNAPSHOT" -STAGING="1.4.1-STAGING" +VERSION="1.5.0-SNAPSHOT" +STAGING="1.5.0-STAGING" PROJECT="multicloud" IMAGE="openstack-windriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/windriver/pom.xml b/windriver/pom.xml index 6ae6c73c..65591f81 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -18,12 +18,12 @@ <parent> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-root</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-windriver</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud-openstack-windriver</name> <description>multicloud for openstack Wind River Titanium Cloud</description> diff --git a/windriver/titanium_cloud/proxy/urls.py b/windriver/titanium_cloud/proxy/urls.py index 7b33801d..dd5d4f1c 100644 --- a/windriver/titanium_cloud/proxy/urls.py +++ b/windriver/titanium_cloud/proxy/urls.py @@ -34,7 +34,7 @@ URLPATTERNS = [ services.GetTenants.as_view()), url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$', dnsaasdelegate.DnsaasDelegate.as_view()), - url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', + url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', services.Services.as_view()), ] diff --git a/windriver/titanium_cloud/proxy/urlsV1.py b/windriver/titanium_cloud/proxy/urlsV1.py index 88a8638a..c3599b57 100644 --- a/windriver/titanium_cloud/proxy/urlsV1.py +++ b/windriver/titanium_cloud/proxy/urlsV1.py @@ -32,7 +32,7 @@ URLPATTERNS = [ services.APIv1GetTenants.as_view()), url(r'dns-delegate/(?P<requri>[0-9a-zA-Z./_-]*)$', dnsaasdelegate.APIv1DnsaasDelegate.as_view()), - url(r'^(?P<servicetype>[0-9a-zA-Z_-]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', + url(r'^(?P<servicetype>[0-9a-zA-Z]{,18})/(?P<requri>[0-9a-zA-Z./_-]*)$', services.APIv1Services.as_view()), ] |