Skip to content

Commit

Permalink
default geo localisation information for amazon EC2
Browse files Browse the repository at this point in the history
  • Loading branch information
@ijm667
ijm667 committed Mar 15, 2014
1 parent 8375b8e commit 6670757
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 6 deletions.
34 changes: 34 additions & 0 deletions configuration/geolocations-amazonEc2.xml
View file
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF8"?>

<import name="amazonEc2:geolocations" xmlns="http://www.compatibleone.fr/schemes/cords.xsd">

<geolocation category="amazonEc2" operator="accords" name=":europe" zone="europe" location="eu-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":north-europe" zone="north-europe" location="eu-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":south-europe" zone="south-europe" location="eu-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":east-europe" zone="east-europe" location="eu-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":west-europe" zone="west-europe" location="eu-west-1" />

<geolocation category="amazonEc2" operator="accords" name=":america" zone="america" location="us-west-2" />
<geolocation category="amazonEc2" operator="accords" name=":north-america" zone="north-america" location="us-west-2" />
<geolocation category="amazonEc2" operator="accords" name=":south-america" zone="south-america" location="sa-east-1" />

<geolocation category="amazonEc2" operator="accords" name=":usa" zone="usa" location="us-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":us-east" zone="us-east" location="us-east-1" />
<geolocation category="amazonEc2" operator="accords" name=":us-west" zone="us-west" location="us-west-2" />

<geolocation category="amazonEc2" operator="accords" name=":asia" zone="asia" location="ap-southeast-1" />
<geolocation category="amazonEc2" operator="accords" name=":north-asia" zone="north-asia" location="ap-northeast-1" />
<geolocation category="amazonEc2" operator="accords" name=":south-asia" zone="south-asia" location="ap-southeast-2" />
<geolocation category="amazonEc2" operator="accords" name=":east-asia" zone="east-asia" location="ap-southeast-2" />
<geolocation category="amazonEc2" operator="accords" name=":west-asia" zone="west-asia" location="ap-southeast-1" />

<geolocation category="amazonEc2" operator="accords" name=":africa" zone="africa" location="eu-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":north-africa" zone="north-africa" location="eu-west-1" />
<geolocation category="amazonEc2" operator="accords" name=":south-africa" zone="south-africa" location="ap-southeast-2" />
<geolocation category="amazonEc2" operator="accords" name=":east-africa" zone="east-africa" location="ap-southeast-2" />
<geolocation category="amazonEc2" operator="accords" name=":west-africa" zone="west-africa" location="eu-west-1" />

</import>



1 change: 1 addition & 0 deletions cordscripts/csp-operations.txt
View file
Expand Up @@ -23,6 +23,7 @@ function OperationMenu()
"<tr>".display();
"<td class=title><a class=option href='dashboard.php?action=compile&script=csp-events.txt&ouput=HTML'>Events</a>".display();
"<td class=title><a class=option href='dashboard.php?action=compile&script=csp-alerts.txt&ouput=HTML'>Alerts</a>".display();
"<td class=title><a class=option href='dashboard.php?action=compile&script=csp-locations.txt&ouput=HTML'>GeoLocations</a>".display();
"<tr><td colspan=3>&nbsp;".display();
"<tr>".display();
"<td class=title><a class=option href='dashboard.php?action=compile&script=csp-federations.txt&ouput=HTML'>Federation</a>".display();
Expand Down
4 changes: 0 additions & 4 deletions pubocci/occiresolver.c
View file
Expand Up @@ -1180,15 +1180,13 @@ public char * occi_resolve_geolocation( char * category, char * operator, char *
}
else if (!( zptr = occi_simple_get( ihost, agent, tls ) ))
{
ihost = liberate( ihost );
yptr = occi_remove_response( yptr );
qptr = occi_remove_request( qptr );
kptr = occi_remove_client( kptr );
return((char *) 0);
}
else if (!( dptr = occi_locate_element( zptr->first, "occi.geolocation.location" ) ))
{
ihost = liberate( ihost );
zptr = occi_remove_response( zptr );
yptr = occi_remove_response( yptr );
qptr = occi_remove_request( qptr );
Expand All @@ -1197,7 +1195,6 @@ public char * occi_resolve_geolocation( char * category, char * operator, char *
}
else if (!( result = allocate_string( dptr->value ) ))
{
ihost = liberate( ihost );
zptr = occi_remove_response( zptr );
yptr = occi_remove_response( yptr );
qptr = occi_remove_request( qptr );
Expand All @@ -1206,7 +1203,6 @@ public char * occi_resolve_geolocation( char * category, char * operator, char *
}
else
{
ihost = liberate( ihost );
zptr = occi_remove_response( zptr );
yptr = occi_remove_response( yptr );
qptr = occi_remove_request( qptr );
Expand Down
21 changes: 19 additions & 2 deletions pyaccords/pysrc/ec2client.c
View file
Expand Up @@ -34,6 +34,7 @@
/* transforms a standard geographical identifier to the corresponding ec2 */
/* specific value. */
/* ---------------------------------------------------------------------- */
static int use_default_values=0;
char * ec2_resolve_region( struct ec2_subscription * sptr, char * region )
{
char * result;
Expand Down Expand Up @@ -71,12 +72,22 @@ char * ec2_resolve_region( struct ec2_subscription * sptr, char * region )
/* -------------------------------------------- */
else if ((result = occi_resolve_geolocation( "amazonEc2", "accords", region )) != (char *) 0)
return( result );
else if (!( use_default_values ))
return( allocate_string( sptr->zone) );

/* ----------------- */
/* Hard Coded Values */
/* ----------------- */

/* --------------------- */
/* europe, east and west */
/* --------------------- */
else if (!( strcasecmp( region, "europe" ) ))
return( allocate_string( "eu-west-1" ) );
else if (!( strcasecmp( region, "north-europe" ) ))
return( allocate_string( "eu-west-1" ) );
else if (!( strcasecmp( region, "south-europe" ) ))
return( allocate_string( "eu-west-1" ) );
else if (!( strcasecmp( region, "east-europe" ) ))
return( allocate_string( "eu-west-1" ) );
else if (!( strcasecmp( region, "west-europe" ) ))
Expand All @@ -91,6 +102,8 @@ char * ec2_resolve_region( struct ec2_subscription * sptr, char * region )
return( allocate_string( "us-west-2" ) );
else if (!( strcasecmp( region, "south-america" ) ))
return( allocate_string( "sa-east-1" ) );
else if (!( strcasecmp( region, "usa" ) ))
return( allocate_string( "us-west-1" ) );
else if (!( strcasecmp( region, "us-east" ) ))
return( allocate_string( "us-east-1" ) );
else if (!( strcasecmp( region, "us-west" ) ))
Expand All @@ -103,10 +116,10 @@ char * ec2_resolve_region( struct ec2_subscription * sptr, char * region )
return( allocate_string( "ap-southeast-1" ) );
else if (!( strcasecmp( region, "north-asia" ) ))
return( allocate_string( "ap-northeast-1" ) );
else if (!( strcasecmp( region, "east-asia" ) ))
return( allocate_string( "ap-southeast-2" ) );
else if (!( strcasecmp( region, "south-asia" ) ))
return( allocate_string( "ap-southeast-2" ) );
else if (!( strcasecmp( region, "east-asia" ) ))
return( allocate_string( "ap-southeast-2" ) );
else if (!( strcasecmp( region, "west-asia" ) ))
return( allocate_string( "ap-southeast-1" ) );

Expand All @@ -119,6 +132,10 @@ char * ec2_resolve_region( struct ec2_subscription * sptr, char * region )
return( allocate_string( "eu-west-1" ) );
else if (!( strcasecmp( region, "south-africa" ) ))
return( allocate_string( "ap-southeast-2" ) );
else if (!( strcasecmp( region, "east-africa" ) ))
return( allocate_string( "ap-southeast-2" ) );
else if (!( strcasecmp( region, "west-africa" ) ))
return( allocate_string( "eu-west-1" ) );

/* -------------------------------------- */
/* invalid region uses subscription value */
Expand Down

0 comments on commit 6670757

Please sign in to comment.