cf_factory 0.0.3 → 0.0.4

data/examples/nat_mutual_monitoring.rb

@@ -0,0 +1,69 @@
+#!/usr/bin/ruby
+
+require 'cf_factory'
+
+cf = CfFactory::CfMain.new("NAT Mutual Monitoring")
+####### input parameters
+param_keyname = CfFactory::CfParameter.new("KeyName", "Name of the key", "String", {"Default" => "majung"})
+cf.add_parameter(param_keyname)
+param_vpc_cidr  = CfFactory::CfParameter.new("VpcCidr", "CIDR of the VPC", "String", {"Default" => "10.0.0.0/16"})
+cf.add_parameter(param_vpc_cidr)
+param_nat_type = CfFactory::CfParameter.new("NatInstanceType", "Type/size of the NAT instances", "String", {"Default" => "m1.small", "AllowedValues" => CfFactory::CfEc2Instance::SUPPORTED_TYPES})
+cf.add_parameter(param_nat_type)
+
+####### mappings
+mapping = CfFactory::CfMapping.new("NatMapping","AMI", {"eu-west-1" => "ami-0b5b6c7f", "us-east-1" => "ami-f619c29f"})
+cf.add_mapping(mapping)
+
+####### resources
+#vpc
+base_vpc = CfFactory::BaseVpc.new("BaseVpc","192.168.0.0/16",2,2,["eu-west-1a","eu-west-1b"],256)
+base_vpc.add_to_template(cf)
+vpc = base_vpc.vpc
+public_sn1, public_sn2, private_sn1, private_sn2 = base_vpc.subnets  
+
+#iam
+commands = ["ec2:DescribeInstances","ec2:DescribeRouteTables", "ec2:ReplaceRoute","ec2:StartInstances","ec2:StopInstances"]
+statement = CfFactory::CfIamStatement.new("Allow",commands,"*")
+role_policy = CfFactory::CfIamPolicy.new("MyRolePolicy", CfFactory::CfPolicyDocument.new([statement]))
+nat_role = CfFactory::CfIamRole.new("NatRole", "/", {:policies => [role_policy]} )
+cf.add_resource(nat_role)
+
+#nats
+script = CfFactory::CfHelper.join([
+  "#!/bin/bash -v\\n",
+  "yum update -y aws*\\n"
+  ]
+)
+nat1 = CfFactory::CfEc2Instance.new("Nat1",mapping.generate_ref("AWS::Region"),param_nat_type.generate_ref, {:keyname => param_keyname.generate_ref(), :subnet => private_sn1, :user_data => script})
+cf.add_resource(nat1)
+eip1 = CfFactory::CfEip.new("Eip1",nat1,true)
+cf.add_resource(eip1)
+nat2 = CfFactory::CfEc2Instance.new("Nat2",mapping.generate_ref("AWS::Region"),param_nat_type.generate_ref, {:keyname => param_keyname.generate_ref(), :subnet => private_sn2, :user_data => script})
+cf.add_resource(nat2)
+eip2 = CfFactory::CfEip.new("Eip2",nat2,true)
+cf.add_resource(eip2)
+nat_sg = CfFactory::CfEc2SecurityGroup.new("NatSecurityGroup","Rules for allowing access to HA Nodes",vpc)
+cf.add_resource(nat_sg)
+nat_sg.add_ingress_rule(CfFactory::CfEc2SecurityGroupIngress.new("tcp",22,22,"0.0.0.0/0",nil))
+nat_sg.add_ingress_rule(CfFactory::CfEc2SecurityGroupIngress.new("-1",0,0,param_vpc_cidr.generate_ref(),nil))
+nat_sg.add_egress_rule(CfFactory::CfEc2SecurityGroupEgress.new("-1",0,0,"0.0.0.0/0",nil))
+
+####### output parameters
+out_vpc = CfFactory::CfOutput.new("BaseVpc", "Id of the VPC", vpc.generate_ref())
+cf.add_output(out_vpc)
+out_nat1 = CfFactory::CfOutput.new("OutNat1","EIP of NAT1",eip1.generate_ref())
+cf.add_output(out_nat1)
+out_nat2 = CfFactory::CfOutput.new("OutNat2","EIP of NAT2",eip2.generate_ref())
+cf.add_output(out_nat2)
+
+cf_json = cf.generate 
+puts cf_json
+
+config_options = YAML.load_file("aws_config.yml")
+#config_options["cloud_formation_endpoint"] = "cloudformation.us-east-1.amazonaws.com"
+
+validator = CfFactory::TemplateValidation.new(cf_json, config_options)
+validator.validate()
+
+#puts "the reference for the VPC : #{vpc.generate_ref}"

data/examples/play_with_region_and_zones.rb

@@ -1,18 +1,20 @@
-require 'help/include_libraries'
+#!/usr/bin/ruby
 
-cf = CfMain.new("Playground")
+require 'cf_factory'
+
+cf = CfFactory::CfMain.new("Playground")
 ##########################
 ami = "ami-6d555119"
 
-az = CfHelper.az_in_region("a")
-instance = CfEc2Instance.new("MyInstance", ami, "t1.micro", {:availability_zone => az })
+az = CfFactory::CfHelper.az_in_region("a")
+instance = CfFactory::CfEc2Instance.new("MyInstance", ami, "t1.micro", {:availability_zone => az })
 cf.add_resource(instance)
 
-region_output = CfOutput.new("Region", "Region the stack was started", CfHelper.ref_current_region())
+region_output = CfFactory::CfOutput.new("Region", "Region the stack was started", CfFactory::CfHelper.ref_current_region())
 cf.add_output(region_output)
-target_zone_output = CfOutput.new("TargetZone", "AZ where instance to be started", az)
+target_zone_output = CfFactory::CfOutput.new("TargetZone", "AZ where instance to be started", az)
 cf.add_output(target_zone_output)
-actual_zone_output = CfOutput.new("ActualInstanceZone", "AZ of started instance", instance.retrieve_attribute("AvailabilityZone"))
+actual_zone_output = CfFactory::CfOutput.new("ActualInstanceZone", "AZ of started instance", instance.retrieve_attribute("AvailabilityZone"))
 cf.add_output(actual_zone_output)
 
 ##########################
@@ -20,7 +22,7 @@ cf_json = cf.generate
 puts cf_json
 
 config_options = YAML.load_file("aws_config.yml")
-validator = TemplateValidation.new(cf_json, config_options)
+validator = CfFactory::TemplateValidation.new(cf_json, config_options)
 validator.validate()
-validator.apply()
+
 

data/examples/ra_web_hosting.rb

@@ -1,7 +1,9 @@
-require 'help/include_libraries'
+#!/usr/bin/ruby
+
+require 'cf_factory'
 
 # CloudFormation template for Atraveo. 2-Tiered web-application with load-balancing.
-cf = CfMain.new("Reference Architecture Web-Hosting")
+cf = CfFactory::CfMain.new("Reference Architecture Web-Hosting")
 
 ####### input parameters
 hosted_zone_id = "ZSSFB90C439AA"
@@ -11,17 +13,17 @@ hosted_zone_name = "dezidr.com"
 #ami_id = "ami-e96bdf80" #eu-west NAT instance
 ami_id = "ami-e96bdf80" #us-east web-server returning something
 
-param_hosted_zone = CfParameter.new("HostedZoneId", "Needs an existing hosted zone in Route53 to be configured", "String", {"Default" => hosted_zone_id})
+param_hosted_zone = CfFactory::CfParameter.new("HostedZoneId", "Needs an existing hosted zone in Route53 to be configured", "String", {"Default" => hosted_zone_id})
 cf.add_parameter(param_hosted_zone)
-param_app_server_ami = CfParameter.new("AppServerAmi", "AMI of App-Server", "String", {"Default" => ami_id})
+param_app_server_ami = CfFactory::CfParameter.new("AppServerAmi", "AMI of App-Server", "String", {"Default" => ami_id})
 cf.add_parameter(param_app_server_ami)
-param_app_server_key = CfParameter.new("AppServerKey", "Key used to start  App-Server", "String")
+param_app_server_key = CfFactory::CfParameter.new("AppServerKey", "Key used to start  App-Server", "String")
 cf.add_parameter(param_app_server_key)
-param_app_port = CfParameter.new("AppPort", "Port of the Web/App-Servers", "Number", {"Default" => "8080"})
+param_app_port = CfFactory::CfParameter.new("AppPort", "Port of the Web/App-Servers", "Number", {"Default" => "8080"})
 cf.add_parameter(param_app_port)
-param_db_user = CfParameter.new("MasterUserName", "Name of the master user name of the DB", "String", {"Default" => "masteruser"})
+param_db_user = CfFactory::CfParameter.new("MasterUserName", "Name of the master user name of the DB", "String", {"Default" => "masteruser"})
 cf.add_parameter(param_db_user)
-param_db_pw = CfParameter.new("MasterPassword", "Password of the master user of the DB", "String")
+param_db_pw = CfFactory::CfParameter.new("MasterPassword", "Password of the master user of the DB", "String")
 cf.add_parameter(param_db_pw)
 
 zone = "us-east"
@@ -31,12 +33,12 @@ zone = "us-east"
 ####### resources
 
 #ebs test
-ebs = CfEbsVolume.create_normal("MyEbs",CfHelper.az_in_region(az_id = "b"),  5)
+ebs = CfFactory::CfEbsVolume.create_normal("MyEbs",CfFactory::CfHelper.az_in_region(az_id = "b"),  5)
 cf.add_resource(ebs)
 
-s3_bucket = CfS3Bucket.new("MyS3Bucket")
+s3_bucket = CfFactory::CfS3Bucket.new("MyS3Bucket")
 cf.add_resource(s3_bucket)
-s3_log_bucket = CfS3Bucket.new("MyS3LogBucket")
+s3_log_bucket = CfFactory::CfS3Bucket.new("MyS3LogBucket")
 s3_log_bucket.set_deletion_policy("Delete")
 cf.add_resource(s3_log_bucket)
 
@@ -50,23 +52,23 @@ cf.add_resource(s3_log_bucket)
 #elb
 #health_check_string = "HTTP:#{param_app_port.generate_ref()}/index.html"
 health_check_string = "HTTP:80/index.html"
-elb = CfElb.new("MyLoadBalancer", {    
-  :health_check => CfHealthCheck.new("3","60", health_check_string,"10","2"),
-  :listeners => [CfListener.new(param_app_port.generate_ref(),"http","80","http")],
+elb = CfFactory::CfElb.new("MyLoadBalancer", {    
+  :health_check => CfFactory::CfHealthCheck.new("3","60", health_check_string,"10","2"),
+  :listeners => [CfFactory::CfListener.new(param_app_port.generate_ref(),"http","80","http")],
   #:security_groups => [elb_sec_group], #only for VPC based ELBs
-  :availability_zones => CfHelper.availability_zones()
+  :availability_zones => CfFactory::CfHelper.availability_zones()
   }
 )
 cf.add_resource(elb)
 
-app_sec_group = CfEc2SecurityGroup.new("AppSecurityGroup", "Security Group for web and app")
-app_sec_group.add_ingress_rule(CfEc2SecurityGroupIngress.new("tcp", 22, 22, "0.0.0.0/0"))
-ir1 = CfEc2SecurityGroupIngress.new("tcp", param_app_port.generate_ref(), param_app_port.generate_ref(), "0.0.0.0/0")
+app_sec_group = CfFactory::CfEc2SecurityGroup.new("AppSecurityGroup", "Security Group for web and app")
+app_sec_group.add_ingress_rule(CfFactory::CfEc2SecurityGroupIngress.new("tcp", 22, 22, "0.0.0.0/0"))
+ir1 = CfFactory::CfEc2SecurityGroupIngress.new("tcp", param_app_port.generate_ref(), param_app_port.generate_ref(), "0.0.0.0/0")
 app_sec_group.add_ingress_rule(ir1)
 cf.add_resource(app_sec_group)
 
-rds_sec_group = CfRdsSecurityGroup.new("RdsSecurityGroup","Security Group for RDS")
-ir = CfRdsSecurityGroupIngress.new(nil,app_sec_group)
+rds_sec_group = CfFactory::CfRdsSecurityGroup.new("RdsSecurityGroup","Security Group for RDS")
+ir = CfFactory::CfRdsSecurityGroupIngress.new(nil,app_sec_group)
 ir.set_use_sg_id(false)
 rds_sec_group.add_rule(ir)
 cf.add_resource(rds_sec_group)
@@ -74,29 +76,29 @@ cf.add_resource(rds_sec_group)
 #rds
 rds_endpoint= "rdsendpoint"
 options = {:multi_az => true, :security_groups => [rds_sec_group]}
-rds_instance = CfRdsInstance.new("MyDatabase",5,"MySql","db.t1.micro",param_db_user.generate_ref(), param_db_pw.generate_ref, options)
+rds_instance = CfFactory::CfRdsInstance.new("MyDatabase",5,"MySql","db.t1.micro",param_db_user.generate_ref(), param_db_pw.generate_ref, options)
 cf.add_resource(rds_instance)
 rds_endpoint = rds_instance.retrieve_attribute("Endpoint.Address") 
 
 #iam-role to be able to read meta-data
-statement = CfIamStatement.new("Allow","cloudformation:DescribeStackResource","*")
-role_policy = CfIamPolicy.new("MyRolePolicy", CfPolicyDocument.new([statement]))
-iam_role = CfIamRole.new("ReadMetaData","/",{:policies => [role_policy]})
+statement = CfFactory::CfIamStatement.new("Allow","cloudformation:DescribeStackResource","*")
+role_policy = CfFactory::CfIamPolicy.new("MyRolePolicy", CfFactory::CfPolicyDocument.new([statement]))
+iam_role = CfFactory::CfIamRole.new("ReadMetaData","/",{:policies => [role_policy]})
 cf.add_resource(iam_role)
 
 #auto-scaling group
-launch_config = CfAsLaunchConfig.new("AppServerLaunchConfig", ami_id, "t1.micro", {:security_groups => [app_sec_group], :user_data => rds_endpoint})
+launch_config = CfFactory::CfAsLaunchConfig.new("AppServerLaunchConfig", ami_id, "t1.micro", {:security_groups => [app_sec_group], :user_data => rds_endpoint})
 cf.add_resource(launch_config)   
-availability_zones = CfHelper.az_array_in_region(["b","c"])
-as_group = CfAsGroup.new("AppServerFleet",availability_zones, launch_config, [elb], 4 ,2 ,{:desired_capacity => 2})
+availability_zones = CfFactory::CfHelper.az_array_in_region(["b","c"])
+as_group = CfFactory::CfAsGroup.new("AppServerFleet",availability_zones, launch_config, [elb], 4 ,2 ,{:desired_capacity => 2})
 cf.add_resource(as_group)
-as_up_scaling_policy = CfAsScalingPolicy.new("MyUpscalePolicy",as_group,"ChangeInCapacity","1",{:cooldown => 300})
+as_up_scaling_policy = CfFactory::CfAsScalingPolicy.new("MyUpscalePolicy",as_group,"ChangeInCapacity","1",{:cooldown => 300})
 cf.add_resource(as_up_scaling_policy)
-as_down_scaling_policy = CfAsScalingPolicy.new("MyDownscalePolicy",as_group,"ChangeInCapacity","-1",{:cooldown => 300})
+as_down_scaling_policy = CfFactory::CfAsScalingPolicy.new("MyDownscalePolicy",as_group,"ChangeInCapacity","-1",{:cooldown => 300})
 cf.add_resource(as_down_scaling_policy)
-as_up_alarm = CfCloudWatchAlarm.new("MyUpAlarm",CfCloudWatchAlarm::GREATER_THAN_OR_EQUAL_TO_THRESHOLD, "3", "CPUUtilization","AWS/EC2",
+as_up_alarm = CfFactory::CfCloudWatchAlarm.new("MyUpAlarm",CfFactory::CfCloudWatchAlarm::GREATER_THAN_OR_EQUAL_TO_THRESHOLD, "3", "CPUUtilization","AWS/EC2",
   "60","Average","80", {:alarm_actions => [as_up_scaling_policy]})
-as_down_alarm = CfCloudWatchAlarm.new("MyDownAlarm",CfCloudWatchAlarm::LESS_THAN_THRESHOLD, "3", "CPUUtilization","AWS/EC2",
+as_down_alarm = CfFactory::CfCloudWatchAlarm.new("MyDownAlarm",CfFactory::CfCloudWatchAlarm::LESS_THAN_THRESHOLD, "3", "CPUUtilization","AWS/EC2",
   "60","Average","30", {:alarm_actions => [as_down_scaling_policy]}) 
 cf.add_resource(as_up_alarm)
 cf.add_resource(as_down_alarm)
@@ -104,33 +106,33 @@ cf.add_resource(as_down_alarm)
 #cloudfront
 # distribution with multiple origins, one for S3, one for the ELB   
 #define origins
-elb_origin = CfOrigin.create_elb_origin(elb)
-s3_origin = CfOrigin.create_s3_origin(s3_bucket) 
+elb_origin = CfFactory::CfOrigin.create_elb_origin(elb)
+s3_origin = CfFactory::CfOrigin.create_s3_origin(s3_bucket) 
 origins = [elb_origin, s3_origin]
 #define cache behaviors for origins
-default_cache_behavior = CfDefaultCacheBehavior.create_basic(elb_origin.id)
+default_cache_behavior = CfFactory::CfDefaultCacheBehavior.create_basic(elb_origin.id)
 cache_behaviors = [
-  CfCacheBehavior.create_basic(s3_origin.id, "/static/*", :min_ttl => 24*60*60),
-  CfCacheBehavior.create_basic(s3_origin.id, "*.jpg", :min_ttl => 24*60*60)  
+  CfFactory::CfCacheBehavior.create_basic(s3_origin.id, "/static/*", :min_ttl => 24*60*60),
+  CfFactory::CfCacheBehavior.create_basic(s3_origin.id, "*.jpg", :min_ttl => 24*60*60)  
 ]
 #tie everything together
 cname_endpoint = "cached-elb-#{(Random.new.rand*100000).to_i}.dezidr.com"
-logging = CfLogging.new(s3_log_bucket,"log-") #activate logging
-cf_distribution = CfCloudfrontDistribution.create_multi_origin_distribution("MyDistribution", origins,
+logging = CfFactory::CfLogging.new(s3_log_bucket,"log-") #activate logging
+cf_distribution = CfFactory::CfCloudfrontDistribution.create_multi_origin_distribution("MyDistribution", origins,
   default_cache_behavior, cache_behaviors, {:logging => logging, :aliases => [cname_endpoint]})
 cf.add_resource(cf_distribution)
 
 #route53
 cloudfront_dns = cf_distribution.retrieve_attribute("DomainName")
-cname = CfRoute53RecordSet.new("CnameRecord", "#{cname_endpoint}", "CNAME", {:ttl => 1, :resource_records => [cloudfront_dns], :hosted_zone_id => hosted_zone_id})
+cname = CfFactory::CfRoute53RecordSet.new("CnameRecord", "#{cname_endpoint}", "CNAME", {:ttl => 1, :resource_records => [cloudfront_dns], :hosted_zone_id => hosted_zone_id})
 cf.add_resource(cname)
-elb_alias = CfRoute53RecordSet.new("ElbAliasRecord","elb-#{(Random.new.rand*100000).to_i}.#{hosted_zone_name}","A", {:alias_target => CfElbAliasTarget.new(elb), :hosted_zone_id => hosted_zone_id})
+elb_alias = CfFactory::CfRoute53RecordSet.new("ElbAliasRecord","elb-#{(Random.new.rand*100000).to_i}.#{hosted_zone_name}","A", {:alias_target => CfFactory::CfElbAliasTarget.new(elb), :hosted_zone_id => hosted_zone_id})
 cf.add_resource(elb_alias)
 
 ####### output parameters
-elb_output = CfOutput.new("ElbEndpoint","Endpoint of the ELB",elb.retrieve_attribute("DNSName"))
+elb_output = CfFactory::CfOutput.new("ElbEndpoint","Endpoint of the ELB",elb.retrieve_attribute("DNSName"))
 cf.add_output(elb_output)
-cloudfront_domain = CfOutput.new("CloudfrontDomain", "Endpoint of the CloudFront distribution", cf_distribution.retrieve_attribute("DomainName"))
+cloudfront_domain = CfFactory::CfOutput.new("CloudfrontDomain", "Endpoint of the CloudFront distribution", cf_distribution.retrieve_attribute("DomainName"))
 cf.add_output(cloudfront_domain)
 
 cf_json = cf.generate 
@@ -139,8 +141,8 @@ puts cf_json
 config_options = YAML.load_file("aws_config.yml")
 config_options["cloud_formation_endpoint"] = "cloudformation.us-east-1.amazonaws.com"
 puts config_options.inspect
-validator = TemplateValidation.new(cf_json, config_options)
+validator = CfFactory::TemplateValidation.new(cf_json, config_options)
 validator.validate()
 #validator.apply({"AppServerAmi" => ami_id, "AppServerKey" => "majung", "AppPort" => "80",  "MasterUserName" => "iamauser", "MasterPassword" => "abcd1234"})
 
-#puts "the reference for the VPC : #{vpc.generate_ref}"
+#puts "the reference for the VPC : #{vpc.generate_ref}"

data/examples/s3_with_cloudfront.rb

@@ -1,7 +1,9 @@
-require 'help/include_libraries'
+#!/usr/bin/ruby
+
+require 'cf_factory'
 
 # CloudFormation template for Atraveo. 2-Tiered web-application with load-balancing.
-cf = CfMain.new("S3 Bucket with CloudFront distribution")
+cf = CfFactory::CfMain.new("S3 Bucket with CloudFront distribution")
 
 ####### input parameters
 
@@ -9,28 +11,25 @@ cf = CfMain.new("S3 Bucket with CloudFront distribution")
 
 ####### resources
 
-s3_bucket = CfS3Bucket.new("OriginBucket")
+s3_bucket = CfFactory::CfS3Bucket.new("OriginBucket")
 cf.add_resource(s3_bucket)
-s3_log_bucket = CfS3Bucket.new("LogBucket")
+s3_log_bucket = CfFactory::CfS3Bucket.new("LogBucket")
 
 #cloudfront
-logging = CfLogging.new(s3_bucket,"MyDistribution")
+logging = CfFactory::CfLogging.new(s3_bucket,"MyDistribution")
 options = {:logging => logging}
-cloudfront_distribution = CfCloudfrontDistribution.create_s3_distribution("MyS3Distribution",s3_bucket)
+cloudfront_distribution = CfFactory::CfCloudfrontDistribution.create_s3_distribution("MyS3Distribution",s3_bucket)
 cf.add_resource(cloudfront_distribution)
 
 ####### output parameters
-s3_domain = CfOutput.new("S3Domain","Domain name of S3 bucket",s3_bucket.retrieve_attribute("DomainName"))
+s3_domain = CfFactory::CfOutput.new("S3Domain","Domain name of S3 bucket",s3_bucket.retrieve_attribute("DomainName"))
 cf.add_output(s3_domain)
-cloudfront_domain = CfOutput.new("CloudfrontDomain", "Endpoint of the CloudFront distribution", cloudfront_distribution.retrieve_attribute("DomainName"))
+cloudfront_domain = CfFactory::CfOutput.new("CloudfrontDomain", "Endpoint of the CloudFront distribution", cloudfront_distribution.retrieve_attribute("DomainName"))
 cf.add_output(cloudfront_domain)
 
 cf_json = cf.generate 
 puts cf_json
 
 config_options = YAML.load_file("aws_config.yml")
-validator = TemplateValidation.new(cf_json, config_options)
+validator = CfFactory::TemplateValidation.new(cf_json, config_options)
 validator.validate()
-validator.apply()
-
-#puts "the reference for the VPC : #{vpc.generate_ref}"

data/examples/test_vpc.rb

@@ -1,40 +1,42 @@
-require 'help/include_libraries'
+#!/usr/bin/ruby
 
-cf = CfMain.new("Bla bla bla")
+require 'cf_factory'
+
+cf = CfFactory::CfMain.new("Bla bla bla")
 ####### input parameters
-parameter = CfParameter.new("KeyName", "Name of the key", "String", {"Default" => "majung"})
+parameter = CfFactory::CfParameter.new("KeyName", "Name of the key", "String", {"Default" => "majung"})
 cf.add_parameter(parameter)
-parameter2 = CfParameter.new("SecurityGroup", "Name of the security group", "String", {"Default" => "Blubber"})
+parameter2 = CfFactory::CfParameter.new("SecurityGroup", "Name of the security group", "String", {"Default" => "Blubber"})
 cf.add_parameter(parameter2)
 
 ####### mappings
-mapping = CfMapping.new("Default","AMI",{"us-east-1" => "ami-c6699baf", "us-west-2" => "ami-52ff7262"})
+mapping = CfFactory::CfMapping.new("Default","AMI",{"us-east-1" => "ami-c6699baf", "us-west-2" => "ami-52ff7262"})
 cf.add_mapping(mapping)
 
 ####### resources
 #vpc
-vpc = CfVpc.new("10.10.0.0/16")
+vpc = CfFactory::CfVpc.new("10.10.0.0/16")
 cf.add_vpc(vpc)
-igw = CfInternetGateway.new("MyInternetGateway", vpc)
+igw = CfFactory::CfInternetGateway.new("MyInternetGateway", vpc)
 vpc.add_internet_gateway(igw)
-route_table = CfRouteTable.new("MyRouteTable")
+route_table = CfFactory::CfRouteTable.new("MyRouteTable")
 vpc.add_route_table(route_table)
-route1 = CfRoute.new("MyRoute1", "88.44.22.11/32", igw)
-route2 = CfRoute.new("MyRoute2", "188.144.122.111/32", igw)
+route1 = CfFactory::CfRoute.new("MyRoute1", "88.44.22.11/32", igw)
+route2 = CfFactory::CfRoute.new("MyRoute2", "188.144.122.111/32", igw)
 route_table.add_route(route1)
 route_table.add_route(route2)
 
-network_acl = CfNetworkAcl.new("MyAcl1")
+network_acl = CfFactory::CfNetworkAcl.new("MyAcl1")
 vpc.add_network_acl(network_acl)
-network_acl_entry = CfNetworkAclEntry.new("Acl1", "110", "6", "ALLOW",  false, "0.0.0.0/0", 80, 80)
+network_acl_entry = CfFactory::CfNetworkAclEntry.new("Acl1", "110", "6", "ALLOW",  false, "0.0.0.0/0", 80, 80)
 network_acl.add_network_acl_entry(network_acl_entry)
 
-subnet1 = CfSubnet.new("WebTier1", "10.10.0.0/24", "eu-west-1a", route_table, network_acl)
+subnet1 = CfFactory::CfSubnet.new("WebTier1", "10.10.0.0/24", "eu-west-1a", route_table, network_acl)
 vpc.add_subnet(subnet1)
-subnet2 = CfSubnet.new("AppTier1", "10.10.1.0/24", "eu-west-1a", route_table, network_acl)
-vpc.add_subnet(subnet2)
-subnet3 = CfSubnet.new("DbTier1", "10.10.2.0/24", "eu-west-1a", route_table, network_acl)
+subnet2 = CfFactory::CfSubnet.new("AppTier1", "10.10.1.0/24", "eu-west-1a", route_table, network_acl)
 vpc.add_subnet(subnet2)
+subnet3 = CfFactory::CfSubnet.new("DbTier1", "10.10.2.0/24", "eu-west-1a", route_table, network_acl)
+vpc.add_subnet(subnet3)
 
 #elb
 #elb = CfElb.new("MyElb", {
@@ -44,10 +46,16 @@ vpc.add_subnet(subnet2)
 #puts elb.get_cf_properties()
 
 ####### output parameters
-output = CfOutput.new("VPC_ID", "Id of the VPC", vpc.generate_ref())
+output = CfFactory::CfOutput.new("VpcId", "Id of the VPC", vpc.generate_ref())
 cf.add_output(output)
 
 
-puts cf.generate
+cf_json = cf.generate
+puts cf_json
+
+config_options = YAML.load_file("aws_config.yml")
+validator = CfFactory::TemplateValidation.new(cf_json, config_options)
+validator.validate()
+
 
-#puts "the reference for the VPC : #{vpc.generate_ref}"
+#puts "the reference for the VPC : #{vpc.generate_ref}"

data/lib/cf_factory/as/cf_as_group.rb

@@ -1,6 +1,7 @@
 require 'cf_factory/base/cf_base'
 require 'cf_factory/base/cf_helper'
 
+module CfFactory
 class CfAsGroup
   include CfBase  
   
@@ -73,3 +74,4 @@ class CfAsGroup
   end
   
 end
+end

data/lib/cf_factory/as/cf_as_launch_config.rb

@@ -1,6 +1,7 @@
 require 'cf_factory/base/cf_base'
 require 'cf_factory/base/cf_helper'
 
+module CfFactory
 class CfAsLaunchConfig
   include CfBase  
   
@@ -51,3 +52,4 @@ class CfAsLaunchConfig
   end
     
 end
+end

data/lib/cf_factory/as/cf_as_scaling_policy.rb

@@ -1,6 +1,7 @@
 require 'cf_factory/base/cf_base'
 require 'cf_factory/base/cf_helper'
 
+module CfFactory
 class CfAsScalingPolicy
   include CfBase  
   
@@ -31,3 +32,4 @@ class CfAsScalingPolicy
   end
     
 end
+end

data/lib/cf_factory/base/cf_base.rb

@@ -1,5 +1,6 @@
 require 'cf_factory/base/cf_helper'
 
+module CfFactory
 module CfBase
   def get_name
     @name
@@ -47,6 +48,8 @@ module CfBase
       case value.class.to_s
       when "Hash"
         output += "        \"#{key}\" : \n{#{hash_to_string(value,indent+5)}},\n"
+      when "EmbeddedProperty"
+        output += "        \"#{key}\" : \n{#{hash_to_string(value.generate,indent+5)},\n"
       else
         output += "        \"#{key}\" : #{set_quotes(value)},\n"
       end
@@ -95,3 +98,5 @@ module CfBase
   end
   
 end
+
+end

data/lib/cf_factory/base/cf_ec2_tag.rb

@@ -1,5 +1,6 @@
 require 'cf_factory/base/cf_inner'
 
+module CfFactory
 class CfEc2Tag
   include CfInner  
   
@@ -30,3 +31,4 @@ class CfEc2Tag
   end
     
 end
+end

data/lib/cf_factory/base/cf_generator.rb

@@ -1,3 +1,4 @@
+module CfFactory
 class CfGenerator
   def initialize(indent)
     @indent = indent
@@ -16,3 +17,4 @@ class CfGenerator
   end
   
 end
+end

data/lib/cf_factory/base/cf_helper.rb

@@ -1,3 +1,4 @@
+module CfFactory
 class CfHelper
   def self.generate_ref(cf_object_ref)
     "{ \"Ref\" : \"#{cf_object_ref}\" }"
@@ -89,3 +90,4 @@ class CfHelper
   end
   
 end
+end

data/lib/cf_factory/base/cf_inner.rb

@@ -17,9 +17,13 @@ module CfInner
     @result += "#{indent}          \"#{@name}\" : {\n"
     attributes.keys.each() {|key|
       value = attributes[key]
-      @result += "#{indent}            \"#{key}\" : #{set_quotes(value)},\n"
+      if (not (value.class.to_s == "String")) and value.method_defined? :get_cf_attributes
+        @result += "#{indent}            \"#{key}\" : #{value.get_cf_attributes},\n}"
+      else
+        @result += "#{indent}            \"#{key}\" : #{set_quotes(value)},\n"
+      end
     }
-    #
+    
     @result = @result.chomp.chomp(",")
     @result += "\n#{indent}      }"
     @result += "\n#{indent}        }"
@@ -30,14 +34,28 @@ module CfInner
     @result = "#{indent}"
     @result += "#{indent}{\n"
     attributes = self.get_cf_attributes
-    attributes.keys.each() {|key|
-      value = attributes[key]
-      @result += "#{indent}          \"#{key}\" : #{set_quotes(value)},\n"
-    }
-    #
-    @result = @result.chomp.chomp(",")
+    @result += hash_to_string(attributes)
+
     @result += "\n#{indent}        }"
   end  
+
+  def hash_to_string(hash, indent=0)
+    output = ""
+    hash.keys.each() do |key|
+      value = hash[key]
+      output += " " * indent
+      case value.class.to_s
+      when "Hash"
+        output += "        \"#{key}\" : \n{#{hash_to_string(value,indent+5)}},\n"
+      else
+        output += "        \"#{key}\" : #{set_quotes(value)},\n"
+      end
+    end
+    output
+    output = output.chomp().chomp(",")
+
+  end
+
   
   # Sets leading and trailing quotes
   def set_quotes(value)
@@ -53,3 +71,4 @@ module CfInner
   end
   
 end
+

data/lib/cf_factory/base/cf_main.rb

@@ -1,3 +1,4 @@
+module CfFactory
 class CfMain
   def initialize(description, version = "2010-09-09")
     @description = description
@@ -98,4 +99,5 @@ class CfMain
     @result += "\n  }\n"
   end
     
-end
+end
+end

data/lib/cf_factory/base/cf_mapping.rb

@@ -1,3 +1,4 @@
+module CfFactory
 class CfMapping
   def initialize(name, target, from_to_hash)
     @name = name
@@ -23,4 +24,5 @@ class CfMapping
   def map_from_region()
     "{\"Fn::FindInMap\" : [ \"#{@name}\", \"#{CfHelper.ref_current_region()}\", \"#{@target}\" ]}"
   end
-end
+end
+end

data/lib/cf_factory/base/cf_named_inner.rb

@@ -0,0 +1 @@
+

data/lib/cf_factory/base/cf_output.rb

@@ -1,5 +1,6 @@
 require 'cf_factory/base/cf_base'
 
+module CfFactory
 class CfOutput
   include CfBase
   
@@ -22,3 +23,4 @@ class CfOutput
   end  
   
 end
+end

data/lib/cf_factory/base/cf_parameter.rb

@@ -1,5 +1,6 @@
 require 'cf_factory/base/cf_base'
 
+module CfFactory
 class CfParameter
   include CfBase
   
@@ -23,3 +24,4 @@ class CfParameter
   end  
   
 end
+end

data/lib/cf_factory/base/cf_script_reader.rb

@@ -1,4 +1,5 @@
 # Reads a file, integrates the specified arguments, and generates indented output taken specified parameters into account
+module CfFactory
 class CfScriptReader
   def initialize(file_to_read, indentation = 0)
     @file = file_to_read
@@ -29,4 +30,5 @@ class CfScriptReader
   private
   
   
-end
+end
+end

data/lib/cf_factory/cloudformation/cf_cloud_formation_init.rb

@@ -1,6 +1,7 @@
 require 'cf_factory/base/cf_base'
 require 'cf_factory/base/cf_inner'
 
+module CfFactory
 class CfCloudFormationInit
   include CfInner
 
@@ -23,3 +24,4 @@ class CfCloudFormationInit
   end
   
 end
+end