Fixes setup scripts for quantum plugins.

Fixes bug 917630.

Change-Id: I3cf66acf46bcfc83755b572756896032cb6a11d1

diff --git a/setup_cisco_plugin.py b/setup_cisco_plugin.py
index a7961138fa8c45ea2f7b90d882790363fe2aa3dc..2bf6eb32daed93b95d1ddced5d6da8eb3d235ce7 100644 (file)
--- a/setup_cisco_plugin.py
+++ b/setup_cisco_plugin.py
@@ -6,11 +6,11 @@ except ImportError:
     from setuptools import setup, find_packages
 
 import sys
-import version
+from quantum import version
 
 Name = 'quantum-cisco-plugin'
 ProjecUrl = ""
-Version = version.get_git_version()
+Version = version.version_string()
 License = 'Apache License 2.0'
 Author = 'Cisco Systems'
 AuthorEmail = ''

diff --git a/setup_client.py b/setup_client.py
index 8a39e0932bdfd5b75b8ba76af010a07a9ffd768e..1eab791507dcf87d4eb3580886888619c2ec9f96 100644 (file)
--- a/setup_client.py
+++ b/setup_client.py
@@ -5,11 +5,11 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
-import version
+from quantum import version
 
 Name = 'quantum-client'
 Url = "https://launchpad.net/quantum"
-Version = version.get_git_version()
+Version = version.version_string()
 License = 'Apache License 2.0'
 Author = 'Netstack'
 AuthorEmail = 'netstack@lists.launchpad.net'

diff --git a/setup_common.py b/setup_common.py
index 3f39b374467fcc8594efbfc863abdc2458390758..2313c15581a7d9b582b18bea62aac816abd855d1 100644 (file)
--- a/setup_common.py
+++ b/setup_common.py
@@ -5,11 +5,11 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
-import version
+from quantum import version
 
 Name = 'quantum-common'
 Url = "https://launchpad.net/quantum"
-Version = version.get_git_version()
+Version = version.version_string()
 License = 'Apache License 2.0'
 Author = 'Netstack'
 AuthorEmail = 'netstack@lists.launchpad.net'

diff --git a/setup_openvswitch_plugin.py b/setup_openvswitch_plugin.py
index bdaeb0ce15e389048e6d5de5ac02616e4b2f8543..54b1a10d2ea6773046ba519b63a23480980bc8b6 100644 (file)
--- a/setup_openvswitch_plugin.py
+++ b/setup_openvswitch_plugin.py
@@ -5,13 +5,13 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
-import version
+from quantum import version
 
 import sys
 
 Name = 'quantum-openvswitch-plugin'
 ProjecUrl = ""
-Version = version.get_git_version()
+Version = version.version_string()
 License = 'Apache License 2.0'
 Author = 'Open vSwitch Team'
 AuthorEmail = 'discuss@openvswitch.org'

diff --git a/setup_sample_plugin.py b/setup_sample_plugin.py
index e3e345eb993b1f66a66a2ed2a6a107793faa0a6d..3379c67e1367172b14beb95d13315cecd57c83e5 100644 (file)
--- a/setup_sample_plugin.py
+++ b/setup_sample_plugin.py
@@ -5,13 +5,13 @@ except ImportError:
     use_setuptools()
     from setuptools import setup, find_packages
 
-import version
+from quantum import version
 import sys
 
 Name = 'quantum-sample-plugin'
 Summary = 'Sample plugin for Quantum'
 Url = "https://launchpad.net/quantum"
-Version = version.get_git_version()
+Version = version.version_string()
 License = 'Apache License 2.0'
 Author = 'Netstack'
 AuthorEmail = 'netstack@lists.launchpad.net'

diff --git a/setup_server.py b/setup_server.py
index ad9e5ac767c2d571eaf30184d9e42eb8104e05ba..563e3c815d9399784fa0d5feb01971de4180f3e5 100644 (file)
--- a/setup_server.py
+++ b/setup_server.py
@@ -7,11 +7,11 @@ except ImportError:
 
 import os
 import sys
-import version
+from quantum import version
 
 Name = 'quantum-server'
 Url = "https://launchpad.net/quantum"
-Version = version.get_git_version()
+Version = version.version_string()
 License = 'Apache License 2.0'
 Author = 'Netstatck'
 AuthorEmail = 'netstack@lists.launchpad.net'