summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vio/vio/__init__.py2
-rw-r--r--vio/vio/pub/__init__.py2
-rw-r--r--vio/vio/pub/config/__init__.py2
-rw-r--r--vio/vio/pub/config/config.py2
-rw-r--r--vio/vio/pub/database/__init__.py2
-rw-r--r--vio/vio/pub/database/models.py2
-rw-r--r--vio/vio/pub/exceptions.py2
-rw-r--r--vio/vio/pub/msapi/__init__.py2
-rw-r--r--vio/vio/pub/msapi/extsys.py2
-rw-r--r--vio/vio/pub/utils/__init__.py2
-rw-r--r--vio/vio/pub/utils/enumutil.py2
-rw-r--r--vio/vio/pub/utils/fileutil.py2
-rw-r--r--vio/vio/pub/utils/idutil.py2
-rw-r--r--vio/vio/pub/utils/restcall.py2
-rwxr-xr-xvio/vio/pub/utils/share_lock.py2
-rw-r--r--vio/vio/pub/utils/syscomm.py2
-rw-r--r--vio/vio/pub/utils/timeutil.py2
-rw-r--r--vio/vio/pub/utils/toscautil.py2
-rw-r--r--vio/vio/pub/utils/values.py2
-rw-r--r--vio/vio/pub/vim/const.py9
-rw-r--r--vio/vio/pub/vim/drivers/vimdriver.py22
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/__init__.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/__init__.py)0
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/cinder_v2.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/cinder_v2.py)10
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/compute.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/compute.py)17
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/image_v2.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/image_v2.py)15
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/keystone_v3.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/keystone_v3.py)16
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/neutron_v2_0.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/neutron_v2_0.py)16
-rw-r--r--vio/vio/pub/vim/drivers/vimsdk/sdk.py (renamed from vio/vio/pub/vim/drivers/openstacksdk/sdk.py)14
-rw-r--r--vio/vio/pub/vim/vimapi/baseclient.py17
-rw-r--r--vio/vio/pub/vim/vimapi/cinder/OperateVolume.py8
-rw-r--r--vio/vio/pub/vim/vimapi/glance/OperateImage.py14
-rw-r--r--vio/vio/pub/vim/vimapi/keystone/OperateTenant.py9
-rw-r--r--vio/vio/pub/vim/vimapi/keystone/auth.py9
-rw-r--r--vio/vio/pub/vim/vimapi/network/OperateNetwork.py19
-rw-r--r--vio/vio/pub/vim/vimapi/network/OperatePort.py19
-rw-r--r--vio/vio/pub/vim/vimapi/network/OperateSubnet.py19
-rw-r--r--vio/vio/pub/vim/vimapi/nova/OperateFlavors.py2
-rw-r--r--vio/vio/pub/vim/vimapi/nova/OperateHypervisor.py2
-rw-r--r--vio/vio/pub/vim/vimapi/nova/OperateLimits.py2
-rw-r--r--vio/vio/pub/vim/vimapi/nova/OperateNova.py2
-rw-r--r--vio/vio/pub/vim/vimapi/nova/OperateServers.py2
-rw-r--r--vio/vio/pub/vim/vimapi/nova/OperateService.py2
-rw-r--r--vio/vio/pub/vim/vimapi/nova/__init__.py2
-rw-r--r--vio/vio/samples/__init__.py2
-rw-r--r--vio/vio/samples/tests.py2
-rw-r--r--vio/vio/samples/urls.py2
-rw-r--r--vio/vio/samples/views.py2
-rw-r--r--vio/vio/settings.py2
-rw-r--r--vio/vio/swagger/__init__.py2
-rw-r--r--vio/vio/swagger/image_utils.py2
-rw-r--r--vio/vio/swagger/nova_utils.py2
-rw-r--r--vio/vio/swagger/tests.py2
-rw-r--r--vio/vio/swagger/urls.py2
-rw-r--r--vio/vio/swagger/views.py2
-rw-r--r--vio/vio/swagger/views/__init__.py2
-rw-r--r--vio/vio/swagger/views/flavor/__init__.py2
-rw-r--r--vio/vio/swagger/views/flavor/views.py3
-rw-r--r--vio/vio/swagger/views/hypervisor/views.py2
-rw-r--r--vio/vio/swagger/views/image/__init__.py2
-rw-r--r--vio/vio/swagger/views/image/views.py3
-rw-r--r--vio/vio/swagger/views/limits/views.py2
-rw-r--r--vio/vio/swagger/views/network/views.py2
-rw-r--r--vio/vio/swagger/views/port/views.py2
-rw-r--r--vio/vio/swagger/views/server/__init__.py2
-rw-r--r--vio/vio/swagger/views/server/views.py3
-rw-r--r--vio/vio/swagger/views/service/views.py2
-rw-r--r--vio/vio/swagger/views/subnet/views.py2
-rw-r--r--vio/vio/swagger/views/swagger_json.py2
-rw-r--r--vio/vio/swagger/views/tenant/__init__.py2
-rw-r--r--vio/vio/swagger/views/tenant/views.py2
-rw-r--r--vio/vio/swagger/views/volume/__init__.py2
-rw-r--r--vio/vio/swagger/views/volume/views.py2
-rw-r--r--vio/vio/swagger/volume_utils.py2
-rw-r--r--vio/vio/urls.py2
-rw-r--r--vio/vio/wsgi.py2
75 files changed, 167 insertions, 185 deletions
diff --git a/vio/vio/__init__.py b/vio/vio/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/__init__.py
+++ b/vio/vio/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/__init__.py b/vio/vio/pub/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/pub/__init__.py
+++ b/vio/vio/pub/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/config/__init__.py b/vio/vio/pub/config/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/pub/config/__init__.py
+++ b/vio/vio/pub/config/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/config/config.py b/vio/vio/pub/config/config.py
index 71a44aa..5c57d2e 100644
--- a/vio/vio/pub/config/config.py
+++ b/vio/vio/pub/config/config.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/database/__init__.py b/vio/vio/pub/database/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/pub/database/__init__.py
+++ b/vio/vio/pub/database/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/database/models.py b/vio/vio/pub/database/models.py
index d07dd6d..b12510a 100644
--- a/vio/vio/pub/database/models.py
+++ b/vio/vio/pub/database/models.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/exceptions.py b/vio/vio/pub/exceptions.py
index 7ebdcc6..394685a 100644
--- a/vio/vio/pub/exceptions.py
+++ b/vio/vio/pub/exceptions.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/msapi/__init__.py b/vio/vio/pub/msapi/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/pub/msapi/__init__.py
+++ b/vio/vio/pub/msapi/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/msapi/extsys.py b/vio/vio/pub/msapi/extsys.py
index 263d910..002f3ad 100644
--- a/vio/vio/pub/msapi/extsys.py
+++ b/vio/vio/pub/msapi/extsys.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/__init__.py b/vio/vio/pub/utils/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/pub/utils/__init__.py
+++ b/vio/vio/pub/utils/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/enumutil.py b/vio/vio/pub/utils/enumutil.py
index 334eb0c..717dc92 100644
--- a/vio/vio/pub/utils/enumutil.py
+++ b/vio/vio/pub/utils/enumutil.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/fileutil.py b/vio/vio/pub/utils/fileutil.py
index e9ea4bb..07b5124 100644
--- a/vio/vio/pub/utils/fileutil.py
+++ b/vio/vio/pub/utils/fileutil.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/idutil.py b/vio/vio/pub/utils/idutil.py
index 95421b7..5d35a7f 100644
--- a/vio/vio/pub/utils/idutil.py
+++ b/vio/vio/pub/utils/idutil.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/restcall.py b/vio/vio/pub/utils/restcall.py
index 67bf1f6..0d7fd25 100644
--- a/vio/vio/pub/utils/restcall.py
+++ b/vio/vio/pub/utils/restcall.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/share_lock.py b/vio/vio/pub/utils/share_lock.py
index bc541e7..10ab225 100755
--- a/vio/vio/pub/utils/share_lock.py
+++ b/vio/vio/pub/utils/share_lock.py
@@ -5,7 +5,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/syscomm.py b/vio/vio/pub/utils/syscomm.py
index f32af8b..833a290 100644
--- a/vio/vio/pub/utils/syscomm.py
+++ b/vio/vio/pub/utils/syscomm.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/timeutil.py b/vio/vio/pub/utils/timeutil.py
index 03efd97..179cbb1 100644
--- a/vio/vio/pub/utils/timeutil.py
+++ b/vio/vio/pub/utils/timeutil.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/toscautil.py b/vio/vio/pub/utils/toscautil.py
index 0c5f7bb..08307a6 100644
--- a/vio/vio/pub/utils/toscautil.py
+++ b/vio/vio/pub/utils/toscautil.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/utils/values.py b/vio/vio/pub/utils/values.py
index f43f8de..ea705dd 100644
--- a/vio/vio/pub/utils/values.py
+++ b/vio/vio/pub/utils/values.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/const.py b/vio/vio/pub/vim/const.py
index 9580148..a6bd797 100644
--- a/vio/vio/pub/vim/const.py
+++ b/vio/vio/pub/vim/const.py
@@ -1,16 +1,15 @@
-# Copyright 2016 ZTE Corporation.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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.
+
VIM_OPENSTACK = "vmware"
diff --git a/vio/vio/pub/vim/drivers/vimdriver.py b/vio/vio/pub/vim/drivers/vimdriver.py
index 3fb5bc0..807cc98 100644
--- a/vio/vio/pub/vim/drivers/vimdriver.py
+++ b/vio/vio/pub/vim/drivers/vimdriver.py
@@ -1,22 +1,20 @@
# Copyright (c) 2017 VMware, Inc.
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-from vio.pub.vim.drivers.openstacksdk import image_v2
-from vio.pub.vim.drivers.openstacksdk import keystone_v3
-from vio.pub.vim.drivers.openstacksdk import cinder_v2
-from vio.pub.vim.drivers.openstacksdk import compute
+from vio.pub.vim.drivers.vimsdk import image_v2
+from vio.pub.vim.drivers.vimsdk import keystone_v3
+from vio.pub.vim.drivers.vimsdk import cinder_v2
+from vio.pub.vim.drivers.vimsdk import compute
class VimDriver(object):
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/__init__.py b/vio/vio/pub/vim/drivers/vimsdk/__init__.py
index e69de29..e69de29 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/__init__.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/__init__.py
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/cinder_v2.py b/vio/vio/pub/vim/drivers/vimsdk/cinder_v2.py
index 0e0c11c..c0c2db1 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/cinder_v2.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/cinder_v2.py
@@ -1,21 +1,19 @@
-# Copyright 2017 VMware, Inc.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 logging
from vio.pub.vim.drivers import base
-from vio.pub.vim.drivers.openstacksdk import sdk
+from vio.pub.vim.drivers.vimsdk import sdk
LOG = logging.getLogger(__name__)
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/compute.py b/vio/vio/pub/vim/drivers/vimsdk/compute.py
index cfe9461..d336703 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/compute.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/compute.py
@@ -1,21 +1,20 @@
# Copyright (c) 2017 VMware, Inc.
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import base64
import logging
from vio.pub.vim.drivers import base
-from vio.pub.vim.drivers.openstacksdk import sdk
+from vio.pub.vim.drivers.vimsdk import sdk
LOG = logging.getLogger(__name__)
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/image_v2.py b/vio/vio/pub/vim/drivers/vimsdk/image_v2.py
index 79ccfba..ba2db47 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/image_v2.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/image_v2.py
@@ -1,22 +1,20 @@
-# Copyright 2017 VMware, Inc.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 logging
from vio.pub.vim.drivers import base
-from vio.pub.vim.drivers.openstacksdk import sdk
+from vio.pub.vim.drivers.vimsdk import sdk
from openstack.image.v2 import image as _image
LOG = logging.getLogger(__name__)
@@ -54,11 +52,8 @@ class GlanceClient(base.DriverBase):
if not all([container_format, disk_format]):
LOG.error( "Both container_format and disk_format are required")
- try:
- img = self._proxy._create(_image.Image, disk_format=disk_format,
+ img = self._proxy._create(_image.Image, disk_format=disk_format,
container_format=container_format, **data)
- except Exception as ex:
- pass
return img
@sdk.translate_exception
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/keystone_v3.py b/vio/vio/pub/vim/drivers/vimsdk/keystone_v3.py
index 7628477..aff2d6f 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/keystone_v3.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/keystone_v3.py
@@ -1,21 +1,19 @@
# Copyright (c) 2017 VMware, Inc.
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
import logging
from vio.pub.vim.drivers import base
-from vio.pub.vim.drivers.openstacksdk import sdk
+from vio.pub.vim.drivers.vimsdk import sdk
LOG = logging.getLogger(__name__)
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/neutron_v2_0.py b/vio/vio/pub/vim/drivers/vimsdk/neutron_v2_0.py
index 6ab7535..1446698 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/neutron_v2_0.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/neutron_v2_0.py
@@ -1,19 +1,17 @@
# Copyright (c) 2017 VMware, Inc.
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
from vio.pub.vim.drivers import base
-from vio.pub.vim.drivers.openstacksdk import sdk
+from vio.pub.vim.drivers.vimsdk import sdk
class NeutronClient(base.DriverBase):
diff --git a/vio/vio/pub/vim/drivers/openstacksdk/sdk.py b/vio/vio/pub/vim/drivers/vimsdk/sdk.py
index 9f01a4d..228ead8 100644
--- a/vio/vio/pub/vim/drivers/openstacksdk/sdk.py
+++ b/vio/vio/pub/vim/drivers/vimsdk/sdk.py
@@ -1,16 +1,14 @@
# Copyright (c) 2017 VMware, Inc.
#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
'''
SDK Client
diff --git a/vio/vio/pub/vim/vimapi/baseclient.py b/vio/vio/pub/vim/vimapi/baseclient.py
index 44b2739..796ce1b 100644
--- a/vio/vio/pub/vim/vimapi/baseclient.py
+++ b/vio/vio/pub/vim/vimapi/baseclient.py
@@ -1,14 +1,15 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Copyright (c) 2017 VMware, Inc.
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import logging
diff --git a/vio/vio/pub/vim/vimapi/cinder/OperateVolume.py b/vio/vio/pub/vim/vimapi/cinder/OperateVolume.py
index 4458309..33224c3 100644
--- a/vio/vio/pub/vim/vimapi/cinder/OperateVolume.py
+++ b/vio/vio/pub/vim/vimapi/cinder/OperateVolume.py
@@ -1,16 +1,14 @@
-# Copyright 2017 VMware, Inc.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 logging
diff --git a/vio/vio/pub/vim/vimapi/glance/OperateImage.py b/vio/vio/pub/vim/vimapi/glance/OperateImage.py
index 446f808..74408f3 100644
--- a/vio/vio/pub/vim/vimapi/glance/OperateImage.py
+++ b/vio/vio/pub/vim/vimapi/glance/OperateImage.py
@@ -1,16 +1,14 @@
-# Copyright 2017 VMware, Inc.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 logging
@@ -93,8 +91,6 @@ class OperateImage(baseclient):
running_thread_lock.acquire()
running_threads[image.id] = image.id
running_thread_lock.release()
- try:
- upload_image_thread.start()
- except Exception as ex:
- pass
+
+ upload_image_thread.start()
return image \ No newline at end of file
diff --git a/vio/vio/pub/vim/vimapi/keystone/OperateTenant.py b/vio/vio/pub/vim/vimapi/keystone/OperateTenant.py
index 31e1752..a60cf46 100644
--- a/vio/vio/pub/vim/vimapi/keystone/OperateTenant.py
+++ b/vio/vio/pub/vim/vimapi/keystone/OperateTenant.py
@@ -1,16 +1,15 @@
-# Copyright 2016 ZTE Corporation.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 logging
diff --git a/vio/vio/pub/vim/vimapi/keystone/auth.py b/vio/vio/pub/vim/vimapi/keystone/auth.py
index 86f03c2..bacfad6 100644
--- a/vio/vio/pub/vim/vimapi/keystone/auth.py
+++ b/vio/vio/pub/vim/vimapi/keystone/auth.py
@@ -1,16 +1,15 @@
-# Copyright 2016 ZTE Corporation.
+# Copyright (c) 2017 VMware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# You may obtain a copy of the License at:
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# 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 logging
diff --git a/vio/vio/pub/vim/vimapi/network/OperateNetwork.py b/vio/vio/pub/vim/vimapi/network/OperateNetwork.py
index 848878e..18adf1b 100644
--- a/vio/vio/pub/vim/vimapi/network/OperateNetwork.py
+++ b/vio/vio/pub/vim/vimapi/network/OperateNetwork.py
@@ -1,18 +1,19 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Copyright (c) 2017 VMware, Inc.
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import logging
from vio.pub.msapi.extsys import get_vim_by_id
-from vio.pub.vim.drivers.openstacksdk import neutron_v2_0
+from vio.pub.vim.drivers.vimsdk import neutron_v2_0
logger = logging.getLogger(__name__)
diff --git a/vio/vio/pub/vim/vimapi/network/OperatePort.py b/vio/vio/pub/vim/vimapi/network/OperatePort.py
index 4ed0112..5e98623 100644
--- a/vio/vio/pub/vim/vimapi/network/OperatePort.py
+++ b/vio/vio/pub/vim/vimapi/network/OperatePort.py
@@ -1,18 +1,19 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Copyright (c) 2017 VMware, Inc.
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import logging
from vio.pub.msapi.extsys import get_vim_by_id
-from vio.pub.vim.drivers.openstacksdk import neutron_v2_0
+from vio.pub.vim.drivers.vimsdk import neutron_v2_0
from vio.pub.vim.vimapi.network.OperateNetwork import BaseNet, translate
diff --git a/vio/vio/pub/vim/vimapi/network/OperateSubnet.py b/vio/vio/pub/vim/vimapi/network/OperateSubnet.py
index b9b4c27..f697d2c 100644
--- a/vio/vio/pub/vim/vimapi/network/OperateSubnet.py
+++ b/vio/vio/pub/vim/vimapi/network/OperateSubnet.py
@@ -1,18 +1,19 @@
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
+# Copyright (c) 2017 VMware, Inc.
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, 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.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import logging
from vio.pub.msapi.extsys import get_vim_by_id
-from vio.pub.vim.drivers.openstacksdk import neutron_v2_0
+from vio.pub.vim.drivers.vimsdk import neutron_v2_0
from vio.pub.vim.vimapi.network.OperateNetwork import BaseNet,translate
diff --git a/vio/vio/pub/vim/vimapi/nova/OperateFlavors.py b/vio/vio/pub/vim/vimapi/nova/OperateFlavors.py
index 92dfbbf..6341845 100644
--- a/vio/vio/pub/vim/vimapi/nova/OperateFlavors.py
+++ b/vio/vio/pub/vim/vimapi/nova/OperateFlavors.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/vimapi/nova/OperateHypervisor.py b/vio/vio/pub/vim/vimapi/nova/OperateHypervisor.py
index 8b3de91..f6a1921 100644
--- a/vio/vio/pub/vim/vimapi/nova/OperateHypervisor.py
+++ b/vio/vio/pub/vim/vimapi/nova/OperateHypervisor.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/vimapi/nova/OperateLimits.py b/vio/vio/pub/vim/vimapi/nova/OperateLimits.py
index 34e0584..6854f60 100644
--- a/vio/vio/pub/vim/vimapi/nova/OperateLimits.py
+++ b/vio/vio/pub/vim/vimapi/nova/OperateLimits.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/vimapi/nova/OperateNova.py b/vio/vio/pub/vim/vimapi/nova/OperateNova.py
index 49461a2..0bb6db0 100644
--- a/vio/vio/pub/vim/vimapi/nova/OperateNova.py
+++ b/vio/vio/pub/vim/vimapi/nova/OperateNova.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/vimapi/nova/OperateServers.py b/vio/vio/pub/vim/vimapi/nova/OperateServers.py
index eb44eb8..1a9972b 100644
--- a/vio/vio/pub/vim/vimapi/nova/OperateServers.py
+++ b/vio/vio/pub/vim/vimapi/nova/OperateServers.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/vimapi/nova/OperateService.py b/vio/vio/pub/vim/vimapi/nova/OperateService.py
index d29779a..f1b0156 100644
--- a/vio/vio/pub/vim/vimapi/nova/OperateService.py
+++ b/vio/vio/pub/vim/vimapi/nova/OperateService.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/pub/vim/vimapi/nova/__init__.py b/vio/vio/pub/vim/vimapi/nova/__init__.py
index 8770c43..de022ef 100644
--- a/vio/vio/pub/vim/vimapi/nova/__init__.py
+++ b/vio/vio/pub/vim/vimapi/nova/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/samples/__init__.py b/vio/vio/samples/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/samples/__init__.py
+++ b/vio/vio/samples/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/samples/tests.py b/vio/vio/samples/tests.py
index a3dbf4b..d0fcd3f 100644
--- a/vio/vio/samples/tests.py
+++ b/vio/vio/samples/tests.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/samples/urls.py b/vio/vio/samples/urls.py
index 0e7ba4c..bba5529 100644
--- a/vio/vio/samples/urls.py
+++ b/vio/vio/samples/urls.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/samples/views.py b/vio/vio/samples/views.py
index a2ba070..fff6f39 100644
--- a/vio/vio/samples/views.py
+++ b/vio/vio/samples/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/settings.py b/vio/vio/settings.py
index 9a95094..f506872 100644
--- a/vio/vio/settings.py
+++ b/vio/vio/settings.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/__init__.py b/vio/vio/swagger/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/__init__.py
+++ b/vio/vio/swagger/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/image_utils.py b/vio/vio/swagger/image_utils.py
index 6380688..f31e76c 100644
--- a/vio/vio/swagger/image_utils.py
+++ b/vio/vio/swagger/image_utils.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/nova_utils.py b/vio/vio/swagger/nova_utils.py
index 6084317..922a49d 100644
--- a/vio/vio/swagger/nova_utils.py
+++ b/vio/vio/swagger/nova_utils.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/tests.py b/vio/vio/swagger/tests.py
index e29efbd..04b4236 100644
--- a/vio/vio/swagger/tests.py
+++ b/vio/vio/swagger/tests.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/urls.py b/vio/vio/swagger/urls.py
index c058df0..1740c03 100644
--- a/vio/vio/swagger/urls.py
+++ b/vio/vio/swagger/urls.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views.py b/vio/vio/swagger/views.py
index 630d965..eced70b 100644
--- a/vio/vio/swagger/views.py
+++ b/vio/vio/swagger/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/__init__.py b/vio/vio/swagger/views/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/views/__init__.py
+++ b/vio/vio/swagger/views/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/flavor/__init__.py b/vio/vio/swagger/views/flavor/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/views/flavor/__init__.py
+++ b/vio/vio/swagger/views/flavor/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/flavor/views.py b/vio/vio/swagger/views/flavor/views.py
index ec22c65..0d46dd7 100644
--- a/vio/vio/swagger/views/flavor/views.py
+++ b/vio/vio/swagger/views/flavor/views.py
@@ -3,12 +3,13 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import json
from rest_framework import status
diff --git a/vio/vio/swagger/views/hypervisor/views.py b/vio/vio/swagger/views/hypervisor/views.py
index 9019047..0df9dc9 100644
--- a/vio/vio/swagger/views/hypervisor/views.py
+++ b/vio/vio/swagger/views/hypervisor/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/image/__init__.py b/vio/vio/swagger/views/image/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/views/image/__init__.py
+++ b/vio/vio/swagger/views/image/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/image/views.py b/vio/vio/swagger/views/image/views.py
index 7d909f3..e57b4f2 100644
--- a/vio/vio/swagger/views/image/views.py
+++ b/vio/vio/swagger/views/image/views.py
@@ -3,13 +3,14 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+import json
from rest_framework import status
from rest_framework.response import Response
diff --git a/vio/vio/swagger/views/limits/views.py b/vio/vio/swagger/views/limits/views.py
index 5122223..4e4e607 100644
--- a/vio/vio/swagger/views/limits/views.py
+++ b/vio/vio/swagger/views/limits/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/network/views.py b/vio/vio/swagger/views/network/views.py
index cb7adfe..b15b922 100644
--- a/vio/vio/swagger/views/network/views.py
+++ b/vio/vio/swagger/views/network/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/port/views.py b/vio/vio/swagger/views/port/views.py
index 9a4af3f..7d9d56e 100644
--- a/vio/vio/swagger/views/port/views.py
+++ b/vio/vio/swagger/views/port/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/server/__init__.py b/vio/vio/swagger/views/server/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/views/server/__init__.py
+++ b/vio/vio/swagger/views/server/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/server/views.py b/vio/vio/swagger/views/server/views.py
index 3348754..785208d 100644
--- a/vio/vio/swagger/views/server/views.py
+++ b/vio/vio/swagger/views/server/views.py
@@ -3,12 +3,13 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
import json
import logging
diff --git a/vio/vio/swagger/views/service/views.py b/vio/vio/swagger/views/service/views.py
index 535f2d2..cdc8103 100644
--- a/vio/vio/swagger/views/service/views.py
+++ b/vio/vio/swagger/views/service/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/subnet/views.py b/vio/vio/swagger/views/subnet/views.py
index f95da54..9678627 100644
--- a/vio/vio/swagger/views/subnet/views.py
+++ b/vio/vio/swagger/views/subnet/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/swagger_json.py b/vio/vio/swagger/views/swagger_json.py
index cf401b5..546f95e 100644
--- a/vio/vio/swagger/views/swagger_json.py
+++ b/vio/vio/swagger/views/swagger_json.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/tenant/__init__.py b/vio/vio/swagger/views/tenant/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/views/tenant/__init__.py
+++ b/vio/vio/swagger/views/tenant/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/tenant/views.py b/vio/vio/swagger/views/tenant/views.py
index 13bce23..44f175d 100644
--- a/vio/vio/swagger/views/tenant/views.py
+++ b/vio/vio/swagger/views/tenant/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/volume/__init__.py b/vio/vio/swagger/views/volume/__init__.py
index a8fe66a..12fa1e8 100644
--- a/vio/vio/swagger/views/volume/__init__.py
+++ b/vio/vio/swagger/views/volume/__init__.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/views/volume/views.py b/vio/vio/swagger/views/volume/views.py
index 91f79f0..86ed2c7 100644
--- a/vio/vio/swagger/views/volume/views.py
+++ b/vio/vio/swagger/views/volume/views.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/swagger/volume_utils.py b/vio/vio/swagger/volume_utils.py
index 562a381..88d811b 100644
--- a/vio/vio/swagger/volume_utils.py
+++ b/vio/vio/swagger/volume_utils.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/urls.py b/vio/vio/urls.py
index bab793d..ab5e952 100644
--- a/vio/vio/urls.py
+++ b/vio/vio/urls.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
diff --git a/vio/vio/wsgi.py b/vio/vio/wsgi.py
index eb516e7..cebb8cb 100644
--- a/vio/vio/wsgi.py
+++ b/vio/vio/wsgi.py
@@ -3,7 +3,7 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
-
+#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software