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
+from sfa.plc.api import PlcSfaApi
+from sfa.plc.aggregate import Aggregate
+from sfa.plc.slices import *
from sfa.util.plxrn import hrn_to_pl_slicename, slicename_to_hrn
from sfa.util.callids import Callids
-from sfa.util.sfalogging import sfa_logger
+from sfa.util.sfalogging import logger
from sfa.rspecs.sfa_rspec import sfa_rspec_version
from sfa.util.version import version_core
#
EUCALYPTUS_RSPEC_SCHEMA='/etc/sfa/eucalyptus.rng'
-api = SfaAPI()
+api = PlcSfaApi()
##
# Meta data of an instance.
# @param sliceHRN The hunman readable name of the slice.
# @return sting()
#
+# This method is no longer needed because the user keys are passed into
+# CreateSliver
+#
def getKeysForSlice(api, sliceHRN):
logger = logging.getLogger('EucaAggregate')
cred = api.getCredential()
userKeys = sliceUser[0]['keys']
keys += userKeys
- return ''.join(keys)
+ return '\n'.join(keys)
##
# A class that builds the RSpec for Eucalyptus.
xml = self.eucaRSpec
cloud = self.cloudInfo
with xml.RSpec(type='eucalyptus'):
- with xml.network(id=cloud['name']):
+ with xml.network(name=cloud['name']):
with xml.ipv4:
xml << cloud['ip']
#self.__keyPairsXML(cloud['keypairs'])
# get hrn of the original caller
origin_hrn = options.get('origin_hrn', None)
if not origin_hrn:
- origin_hrn = Credential(string=creds).get_gid_caller().get_hrn()
- # origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
+ origin_hrn = Credential(string=creds[0]).get_gid_caller().get_hrn()
conn = getEucaConnection()
"""
Hook called via 'sfi.py create'
"""
-def CreateSliver(api, xrn, creds, xml, users, call_id):
+def CreateSliver(api, slice_xrn, creds, xml, users, call_id):
if Callids().already_handled(call_id): return ""
global cloud
- hrn = urn_to_hrn(xrn)[0]
logger = logging.getLogger('EucaAggregate')
+ logger.debug("In CreateSliver")
+
+ aggregate = Aggregate(api)
+ slices = Slices(api)
+ (hrn, type) = urn_to_hrn(slice_xrn)
+ peer = slices.get_peer(hrn)
+ sfa_peer = slices.get_sfa_peer(hrn)
+ slice_record=None
+ if users:
+ slice_record = users[0].get('slice_record', {})
conn = getEucaConnection()
if not conn:
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)
if not rspecValidator(rspecXML):
error = rspecValidator.error_log.last_error
message = '%s (line %s)' % (error.message, error.line)
- # XXX: InvalidRSpec is new. Currently, I am not working with Trunk code.
- #raise InvalidRSpec(message)
- raise Exception(message)
+ raise InvalidRSpec(message)
+
+ """
+ Create the sliver[s] (slice) at this aggregate.
+ Verify HRN and initialize the slice record in PLC if necessary.
+ """
+
+ # ensure site record exists
+ site = slices.verify_site(hrn, slice_record, peer, sfa_peer)
+ # ensure slice record exists
+ slice = slices.verify_slice(hrn, slice_record, peer, sfa_peer)
+ # ensure person records exists
+ persons = slices.verify_persons(hrn, slice, users, peer, sfa_peer)
# Get the slice from db or create one.
s = Slice.select(Slice.q.slice_hrn == hrn).getOne(None)
if existingInst.get('id') in pendingRmInst:
pendingRmInst.remove(existingInst.get('id'))
for inst in pendingRmInst:
- logger.debug('Instance %s will be terminated' % inst)
dbInst = EucaInstance.select(EucaInstance.q.instance_id == inst).getOne(None)
- # Only change the state but do not remove the entry from the DB.
- dbInst.meta.state = 'deleted'
- #dbInst.destroySelf()
- conn.terminate_instances(pendingRmInst)
+ if dbInst.meta.state != 'deleted':
+ logger.debug('Instance %s will be terminated' % inst)
+ # Terminate instances one at a time for robustness
+ conn.terminate_instances([inst])
+ # Only change the state but do not remove the entry from the DB.
+ dbInst.meta.state = 'deleted'
+ #dbInst.destroySelf()
# Process new instance requests
requests = rspecXML.findall(".//request")
if requests:
# Get all the public keys associate with slice.
- pubKeys = getKeysForSlice(api, s.slice_hrn)
+ keys = []
+ for user in users:
+ keys += user['keys']
+ logger.debug("Keys: %s" % user['keys'])
+ pubKeys = '\n'.join(keys)
logger.debug('Passing the following keys to the instance:\n%s' % pubKeys)
for req in requests:
vmTypeElement = req.getparent()
# 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)]
server_key_file = '/var/lib/sfa/authorities/server.key'
server_cert_file = '/var/lib/sfa/authorities/server.cert'
- api = SfaAPI(key_file = server_key_file, cert_file = server_cert_file, interface='aggregate')
+ api = PlcSfaApi(key_file = server_key_file, cert_file = server_cert_file, interface='aggregate')
print getKeysForSlice(api, 'gc.gc.test1')
if __name__ == "__main__":
git://git.onelab.eu / sfa.git / blobdiff