diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/version.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/nova/version.py b/nova/version.py index 7b27acb6a..24af76557 100644 --- a/nova/version.py +++ b/nova/version.py @@ -28,10 +28,12 @@ FINAL = False # This becomes true at Release Candidate time def canonical_version_string(): + return '' return '.'.join([YEAR, COUNT]) def version_string(): + return '' if FINAL: return canonical_version_string() else: @@ -39,8 +41,10 @@ def version_string(): def vcs_version_string(): + return '' return "%s:%s" % (version_info['branch_nick'], version_info['revision_id']) def version_string_with_vcs(): + return '' return "%s-%s" % (canonical_version_string(), vcs_version_string()) diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 5b4ea992a..b832907ce 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -776,6 +776,10 @@ class FirewallDriver(object): At this point, the instance isn't running yet.""" raise NotImplementedError() + def unfilter_instance(self, instance): + """Stop filtering instance""" + raise NotImplementedError() + def apply_instance_filter(self, instance): """Apply instance filter. @@ -966,6 +970,10 @@ class NWFilterFirewall(FirewallDriver): # execute in a native thread and block current greenthread until done tpool.execute(self._conn.nwfilterDefineXML, xml) + def unfilter_instance(self, instance): + # Nothing to do + pass + def prepare_instance_filter(self, instance): """ Creates an NWFilter for the given instance. In the process, |