Commit 40aaf4d6 authored Aug 02, 2012 by Anael Beutot

Removed tags.py

Moved to cc-common

parent 80eeb6f9

cloudcontrol/node/host/init.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,8 +15,8 @@ from subprocess import Popen, PIPE, STDOUT

		from sjrpc.utils import pass_connection, threadless
		from sjrpc.core.protocols import TunnelProtocol
		from cloudcontrol.common.client.tags import Tag, tag_inspector

		from cloudcontrol.node.tags import Tag, tag_inspector
		from cloudcontrol.node.plugins import Base as BasePlugin
		from cloudcontrol.node.host import tags

cloudcontrol/node/host/tags.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -9,8 +9,7 @@ from multiprocessing import cpu_count
		from socket import getfqdn

		import psutil

		from cloudcontrol.node.tags import ttl, refresh
		from cloudcontrol.common.client.tags import ttl, refresh


		@ttl(3600 * 24) # one day

cloudcontrol/node/hypervisor/init.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,9 +10,9 @@ from xml.etree import cElementTree as et

		import libvirt
		from sjrpc.utils import threadless, pass_connection
		from cloudcontrol.common.client.tags import Tag, tag_inspector, get_tags

		from cloudcontrol.node.host import Handler as HostHandler
		from cloudcontrol.node.tags import Tag, tag_inspector, get_tags
		from cloudcontrol.node.hypervisor import tags
		from cloudcontrol.node.hypervisor.kvm import KVM
		from cloudcontrol.node.exc import (

cloudcontrol/node/hypervisor/domains/init.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@ from collections import namedtuple

		import pyev
		import libvirt
		from cloudcontrol.common.client.tags import Tag, tag_inspector

		from cloudcontrol.node.tags import Tag, tag_inspector
		from cloudcontrol.node.hypervisor import lib as _libvirt
		from cloudcontrol.node.hypervisor.lib import DOMAIN_STATES as STATE
		from cloudcontrol.node.hypervisor.domains import vm_tags

cloudcontrol/node/hypervisor/domains/vm_tags.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,7 @@ from xml.etree import cElementTree as et
		from StringIO import StringIO

		import libvirt

		from cloudcontrol.node.tags import ttl, refresh
		from cloudcontrol.common.client.tags import ttl, refresh


		logger = logging.getLogger(__name__)