from __future__ import with_statement
import sys
-import os
+import os, errno
import logging
import datetime
from sfa.util.faults import *
from sfa.util.xrn import urn_to_hrn, Xrn
-from sfa.util.rspec import RSpec
from sfa.server.registry import Registries
from sfa.trust.credential import Credential
from sfa.plc.api import SfaAPI
rspecValidator = ET.RelaxNG(schemaXML)
rspecXML = ET.XML(xml)
for network in rspecXML.iterfind("./network"):
- if network.get('id') != cloud['name']:
+ if network.get('name') != cloud['name']:
# Throw away everything except my own RSpec
# sfa_logger().error("CreateSliver: deleting %s from rspec"%network.get('id'))
network.getparent().remove(network)
# with enough data for the client to understand what's happened
return xml
+##
+# Return information on the IP addresses bound to each slice's instances
+#
+def dumpInstanceInfo():
+ logger = logging.getLogger('EucaMeta')
+ outdir = "/var/www/html/euca/"
+ outfile = outdir + "instances.txt"
+
+ try:
+ os.makedirs(outdir)
+ except OSError, e:
+ if e.errno != errno.EEXIST:
+ raise
+
+ dbResults = Meta.select(
+ AND(Meta.q.pri_addr != None,
+ Meta.q.state == 'running')
+ )
+ dbResults = list(dbResults)
+ f = open(outfile, "w")
+ for r in dbResults:
+ instId = r.instance.instance_id
+ ipaddr = r.pri_addr
+ hrn = r.instance.slice.slice_hrn
+ logger.debug('[dumpInstanceInfo] %s %s %s' % (instId, ipaddr, hrn))
+ f.write("%s %s %s\n" % (instId, ipaddr, hrn))
+ f.close()
+
##
# A separate process that will update the meta data.
#
logger.debug('[update process] dbResults: %s' % dbResults)
instids = []
for r in dbResults:
+ if not r.instance:
+ continue
instids.append(r.instance.instance_id)
logger.debug('[update process] Instance Id: %s' % ', '.join(instids))
dbInst.meta.pub_addr = ipData['pub_addr']
dbInst.meta.state = 'running'
+ dumpInstanceInfo()
+
def GetVersion(api):
xrn=Xrn(api.hrn)
request_rspec_versions = [dict(sfa_rspec_version)]