dyntool 0.0.2 → 0.0.3

data/lib/dyntool.rb

@@ -5,10 +5,12 @@ require 'uri'
 require 'json'
 require 'ipaddr'
 require 'highline/import'
+require 'yaml'
 ### class for loading and retrieving configuration from dyn.yml
 class LoadConfig
-	def SetConfFile=( confFile )
-		@confFile = confFile
+	def SetConfFile
+		@pwd = Dir.pwd
+		@confFile = "#{@pwd}/dyn.yml"
 	end
 	def GetHandler
 		@conf = YAML.load_file(@confFile)
@@ -34,8 +36,8 @@ class LoadConfig
 	def GetCountries(region)
 		@countries = @conf['regions'][region]
 	end
-	def GetDcsEnabled(region)
-		@dcs = @conf['enable'][region]
+	def GetDcsEnabled(region,service)
+		@dcs = @conf[service][region]
 	end
 	def GetIpLabel(ip)
 		@iplabel = @conf['ips'][ip]['label']
@@ -70,7 +72,7 @@ class Parameters
 	def SetArgs=( argv )
 		@ARGV = argv
 		@sconf = LoadConfig.new()
-		@sconf.SetConfFile = "dyn.yml"
+		@sconf.SetConfFile #= "dyn.yml"
 		@sconf.GetHandler
 	end
 	# Opening Session to dyn using creds from the command line
@@ -96,18 +98,18 @@ class Parameters
 			when "generate" then ValidateGenerate()
 			when "get" then ValidateGet()
 			when "revert" then ValidateRevert()
+			else DisplayUsage()
 		end
 	end
 	# validating revert to current yml configuration
 	def ValidateRevert()
 		@services = @session.GetServices()
-		ValidateServiceExist(@services,@ARGV[2])
-		CompareGeo(@ARGV[2])
+		ValidateServiceExist(@services,@ARGV[1])
+		CompareGeo(@ARGV[1])
 		AskUser()
-		ValidateZone(@ARGV[1])
 		@operate.SetOperation("RevertGeo")
 		@operate.SetSession(@session)
-		@operate.SetArgs(@ARGV[1],@ARGV[2])
+		@operate.SetArgs(@ARGV[1])
 
 	end
 	# Get approval from user to revert/shift after reviewing the changes
@@ -126,6 +128,12 @@ class Parameters
 		     @valid = arg 
 		end
 	end
+	def GetZone(fqdn)
+		@fqdn_parts = fqdn.split('.')
+		@zone = "#{@fqdn_parts[-2]}" + "." + "#{@fqdn_parts[-1]}"
+		return(@zone)
+	end
+		
 	# Validating the get operation, and setting the relevant arguments in OperateDyn object
 	def ValidateGet()
 		case @ARGV[1]
@@ -134,59 +142,69 @@ class Parameters
 			when "node" then     @operate.SetOperation("GetNodeService")
 					     @operate.SetArgs(@ARGV[2])
 					     @operate.SetSession(@session)
-			when "cname" then    ValidateZone(@ARGV[2])
-					     ValidateFqdn(@ARGV[2],@ARGV[3],"true")	
+			when "cname" then    @zone = GetZone(@ARGV[2])
+					     ValidateZone(@zone)
+					     ValidateFqdn(@zone,@ARGV[2],"true")	
 					     @operate.SetOperation("GetCnameService")
-					     @operate.SetArgs(@ARGV[2],@ARGV[3])
+					     @operate.SetArgs(@zone,@ARGV[2])
 					     @operate.SetSession(@session)
 		end
 	end
 	# Check type of record to add, the zone exist, then upon type, check arguments and set the required add operation
 	def ValidateAdd
 		ValidateType(@ARGV[1])
-		ValidateZone(@ARGV[2])
 		case @ARGV[1]
-			when "a" then     ValidateFqdn(@ARGV[2],@ARGV[3],"false")
-				          ValidateIP(@ARGV[4])
+			when "a" then 	  @zone = GetZone(@ARGV[2])
+					  ValidateZone(@zone)
+					  ValidateFqdn(@zone,@ARGV[2],"false")
+				          ValidateIP(@ARGV[3])
 				          @operate.SetOperation("AddARecord")
 				          @operate.SetSession(@session)
-				          @operate.SetArgs(@ARGV[2],@ARGV[3],@ARGV[4])
-			when "cname" then ValidateFqdn(@ARGV[2],@ARGV[3],"true")
-			                  ValidateFqdn(@ARGV[2],@ARGV[4],"false")
+				          @operate.SetArgs(@zone,@ARGV[2],@ARGV[3])
+			when "cname" then @zone = GetZone(@ARGV[2]) 
+					  ValidateZone(@zone)
+			                  ValidateFqdn(@zone,@ARGV[2],"false")
 				          @operate.SetOperation("AddCnameRecord")
 				          @operate.SetSession(@session)
-					  @operate.SetArgs(@ARGV[2],@ARGV[3],@ARGV[4])
-			when "txt" then   ValidateFqdn(@ARGV[2],@ARGV[3],"true")
+					  @operate.SetArgs(@zone,@ARGV[2],@ARGV[3])
+			when "txt" then   @zone = GetZone(@ARGV[2])
+					  ValidateZone(@zone)
+					  ValidateFqdn(@zone,@ARGV[2],"true")
 				  	  @operate.SetOperation("AddTxtRecord")
 					  @operate.SetSession(@session)
-					  @operate.SetArgs(@ARGV[2],@ARGV[3],@ARGV[4])
+					  @operate.SetArgs(@zone,@ARGV[2],@ARGV[3])
+			when "zone" then  @operate.SetOperation("AddZone")
+					  @operate.SetSession(@session)
+					  @operate.SetArgs(@ARGV[2])
 		end
 	end
 	def ValidateChange
 		ValidateType(@ARGV[1])
-		ValidateZone(@ARGV[2])
+		@zone = GetZone(@ARGV[2])
+		ValidateZone(@zone)
 		case @ARGV[1]
-			when "cname" then ValidateFqdn(@ARGV[2],@ARGV[3],"true")
-                        		  ValidateFqdn(@ARGV[2],@ARGV[4],"true")
+			when "cname" then ValidateFqdn(@zone,@ARGV[2],"true")
+                        		  ValidateFqdn(@zone,@ARGV[3],"true")
 			   		  @operate.SetOperation("ChangeCnameRecord")
 					  @operate.SetSession(@session)
-					  @operate.SetArgs(@ARGV[2],@ARGV[3],@ARGV[4])
+					  @operate.SetArgs(@zone,@ARGV[2],@ARGV[3])
 		end
 	end
 	# Validating the delete arguments: zone and fqdn exist, in case of service that the service exist
 	def ValidateDel
 		case @ARGV[1]
-			when "node" then ValidateZone(@ARGV[2])
-			            	 ValidateFqdn(@ARGV[2],@ARGV[3],"true")
-			  	         @operate.SetOperation("DeleteNode")
-				         @operate.SetSession(@session)
-				         @operate.SetArgs(@ARGV[2],@ARGV[3])
-			when "service" then ValidateZone(@ARGV[3])
+			when "node" then    @zone = GetZone(@ARGV[2])
+					    ValidateZone(@zone)
+			            	    ValidateFqdn(@zone,@ARGV[2],"true")
+			  	            @operate.SetOperation("DeleteNode")
+				            @operate.SetSession(@session)
+				            @operate.SetArgs(@zone,@ARGV[2])
+			when "service" then #ValidateZone(@ARGV[3])
 					    @services = @session.GetServices()
 					    ValidateServiceExist(@services,@ARGV[2])
 				            @operate.SetOperation("DeleteService")
 				            @operate.SetSession(@session)
-				            @operate.SetArgs(@ARGV[2],@ARGV[3])
+				            @operate.SetArgs(@ARGV[2])
 			end
 	end
 	def ValidateShift
@@ -194,18 +212,18 @@ class Parameters
 		@sproviders = @sconf
 		@services = @session.GetServices()
 		ValidateServiceExist(@services,@ARGV[1])
-		ValidateZone(@ARGV[2])
-		@resource = ValidateShiftArgs(@ARGV[3],@ARGV[6],@ARGV[4])
+		#ValidateZone(@ARGV[2])
+		@resource = ValidateShiftArgs(@ARGV[2],@ARGV[5],@ARGV[3])
 		case @resource
-			when "dc" then @dcs = GetArgsDcs(@ARGV[5],@sdcs)
+			when "dc" then @dcs = GetArgsDcs(@ARGV[4],@sdcs)
 				@dcs_list = @dcs.join("-")
 				@operate.SetOperation("ShiftTraffic")
              		        @operate.SetSession(@session)
-               			@operate.SetArgs(@ARGV[1],@ARGV[4],@ARGV[5],@dcs_list,@ARGV[2])
-			when "provider" then ValidateProvider(@ARGV[5],@ARGV[7])
+               			@operate.SetArgs(@ARGV[1],@ARGV[3],@ARGV[4],@dcs_list)
+			when "provider" then ValidateProvider(@ARGV[4],@ARGV[6])
 				@operate.SetOperation("ShiftTraffic")
              		        @operate.SetSession(@session)
-               			@operate.SetArgs(@ARGV[1],@ARGV[4],@ARGV[5],@ARGV[7],@ARGV[2])
+               			@operate.SetArgs(@ARGV[1],@ARGV[3],@ARGV[4],@ARGV[6])
 		end
 	end
 	# Get dcs list from arguments
@@ -215,7 +233,7 @@ class Parameters
 		@sdcs = sdcs
 		@ARGV.each do |arg|
 			@c += 1
-			if (@c > 7)
+			if (@c > 6)
 				if (! @sdcs.include? "#{arg}")
 					abort("The dcs is not in the configuration dcs list")
 				else
@@ -247,12 +265,13 @@ class Parameters
 		end
 	end
 	def ValidateGenerate
+		@zone = GetZone(@ARGV[2])
 		ValidateServiceFormat(@ARGV[1])
-		ValidateZone(@ARGV[2])
-		ValidateFqdn(@ARGV[2],@ARGV[3],"false")
+		ValidateZone(@zone)
+		ValidateFqdn(@zone,@ARGV[2],"false")
 		@operate.SetOperation("GenerateGeoNode")
 		@operate.SetSession(@session)
-		@operate.SetArgs(@ARGV[1],@ARGV[2],@ARGV[3])
+		@operate.SetArgs(@ARGV[1],@zone,@ARGV[2])
 	end
 	def ValidateServiceFormat(service)
 		@service = service
@@ -301,7 +320,7 @@ class Parameters
 	end
 	# check that record type is in the allow list
 	def ValidateType(type)
-		@types = [ "a", "cname", "txt" ]
+		@types = [ "a", "cname", "txt", "zone" ]
 		if ! @types.include? type
 			puts "Not a valid record type"
 			DisplayUsage()
@@ -309,39 +328,49 @@ class Parameters
 	end
 	# display script usage
 	def DisplayUsage
-		puts "Usage of dynamo.rb cmd"
-		puts "**********************"
-		puts "**********************"
-		puts "(add)"
-		puts "********************"
-		puts "- a zone fqdn(a) ip , example: dynamo.rb add a example.com mynode.example.com 11.12.13.14"
-		puts "- cname zone fqdn(a) fqdn(cname) , example: dynamo.rb add cname example.com mynode.example.com mycnamenode.example.com"
-		puts "- txt zone fqdn(a) \"some text\" , example: dynamo.rb add txt example.com mynode.example.com \"this is some text\""
-		puts "(del)"
-		puts "********************"
-		puts "- del zone node fqdn(node) - node can be a,cname,txt,geonode,etc , example: dynamo.rb del node example.com mynode.example.com" 
-		puts "- del service geoservice zone, example: dynamo.rb del service geo17 example.com"
-		puts "(change)"
-		puts "********************"
-		puts "- change cname zone cname newfqdn, example: dynamo.rb change cname example.com mycnamenode.example.com test19.example.com"
-		puts "(generate)"
-		puts "geo service from yaml"
-		puts "********************"
-		puts "- generate geoservice zone geonode, example: dynamo.rb generate geo11 example.com test11.example.com"
-		puts "(shift)"
-		puts "********************"
-		puts " - shift geoservice zone from dc/provider to dc/dcs/provider(in same dc)"
-		puts "example1(shift traffic from chidc1 to nydc1): dynamo.rb shift geo11 example.com from dc chidc1 to nydc1"
-		puts "example1(shift traffic from chidc1 to nydc1 and ladc1): dynamo.rb shift geo11 example.com from dc chidc1 to nydc1 ladc1"
-		puts "example3(shift traffic from amc_chi to inap_chi): dynamo.rb shift geo15 example.com from provider amc_chi to inap_chi"
-		puts "(revert)"
-		puts "go back to state of yaml configuration"
-		puts "*******************"
-		puts "- revert zone geoservice, example: dynamo.rb revert example.com geo15"
-		puts "(get)"
-		puts " - get services (get all geo services), example: dynamo.rb get services"
-		puts " - get node geonode, example: dynamo.rb get node test1.example.com"
-		puts " - get cname zone cname, example: dynamo.rb get cname example.com mycnamenode.example.com"
+		STDOUT.puts <<-EOF
+		Usage:
+
+		* add: Adding a new record *
+
+		   add a fqdn(a) ip 				 				 example: dynamo.rb add a mynode.example.com 11.12.13.14
+	 	   add cname zone fqdn(a) fqdn(cname) 			    		         example: dynamo.rb add cname mycnamenode.example.com mynode.example.com
+		   add txt zone fqdn(a) "some text" 		 				 example: dynamo.rb add txt mynode.example.com "this is some text"
+		
+		
+		* del: Deleting a node or service *
+
+		   del zone node fqdn(node) - node can be a,cname,txt,geonode,etc 	         example: dynamo.rb del node mynode.example.com
+		   del service geoservice zone							 example: dynamo.rb del service geo17
+		
+		
+		* change: Changing a record *
+		
+		   change cname zone cname newfqdn						 example: dynamo.rb change cname mycnamenode.example.com test19.example.com
+		
+		
+		* generate: Generating Geo service from yaml *
+
+		   generate geoservice zone geonode						 example: dynamo.rb generate geo11 test11.example.com
+		
+		
+		* shift: Shifting traffic from dc or from provider on geo service *
+
+		   shift geoservice zone from dc/provider to dc/dcs/provider(in same dc)	 example1: dynamo.rb shift geo11 from dc chidc1 to nydc1
+												 example2: dynamo.rb shift geo11 from dc chidc1 to nydc1 ladc1
+												 example3: dynamo.rb shift geo15 from provider amc_chi to inap_chi
+		
+		* revert: Reverting a state of geo service to yaml state *
+		
+		  revert zone geoservice 							 example: dynamo.rb revert geo15
+		
+		
+		* get: Getting infotmation of geo services, geonodes, cname pointing to geo *
+
+		   get services (get all geo services)						 example: dynamo.rb get services
+	  	   get node geonode								 example: dynamo.rb get node test1.example.com
+		   get cname zone cname								 example: dynamo.rb get cname mycnamenode.example.com
+		EOF
 		exit(2)
 	end
 	# compare service geo data of current state vs yaml file
@@ -374,7 +403,7 @@ class Parameters
 			region['rdata']['a_rdata'].each do |rdata|
 				@current_ips << rdata['address']
 			end
-			@sconf.GetDcsEnabled(@name).each do |dc|
+			@sconf.GetDcsEnabled(@name,service).each do |dc|
 				@providers = @sconf.GetDcProviders(dc)
 				@providers.each do |provider|
 					@sconf.GetIPs(provider).each do |ips|
@@ -458,13 +487,14 @@ class OperateDyn
 	def RunOP
 		case(@@op)
 			when "AddARecord" then @@session.AddARecord(@@args[0],@@args[1],@@args[2])
+			when "AddZone" then @@session.CreateZone(@@args[0])
 			when "DeleteNode" then @@session.DeleteNode(@@args[0],@@args[1])
-			when "DeleteService" then @@session.DeleteService(@@args[0],@@args[1])
+			when "DeleteService" then @@session.DeleteService(@@args[0])
 			when "AddCnameRecord" then @@session.AddCnameRecord(@@args[0],@@args[1],@@args[2],"post")
 			when "AddTxtRecord" then @@session.AddTxtRecord(@@args[0],@@args[1],@@args[2])
 			when "ChangeCnameRecord" then @@session.AddCnameRecord(@@args[0],@@args[1],@@args[2],"put")
 			when "GenerateGeoNode" then @record_data = BuildService(@@args[0],"","","")
-						    @@session.GenerateGeoService(@@args[0],@@args[1],@record_data,"create")
+						    @@session.GenerateGeoService(@@args[0],@record_data,"create")
 						    @@session.GenerateGeoNode(@@args[0],@@args[1],@@args[2])
 			when "GetServices" then @services = @@session.GetServices()
 						puts "Here is the list of Geo services:"
@@ -475,9 +505,9 @@ class OperateDyn
 						      @geonode = @@session.GetCnameService(@@args[1],@@args[0])
 						      GetGeoNodeService(@services,@geonode)
 	                when "ShiftTraffic" then @record_data = BuildService(@@args[0],@@args[1],@@args[2],@@args[3])
-						 @@session.GenerateGeoService(@@args[0],@@args[4],@record_data,"update")
+						 @@session.GenerateGeoService(@@args[0],@record_data,"update")
 			when "RevertGeo" then @record_data = BuildService(@@args[0],"","","")
-					      @@session.GenerateGeoService(@@args[1],@@args[0],@record_data,"update")
+					      @@session.GenerateGeoService(@@args[0],@record_data,"update")
 		end
 	end
 	def GetOP
@@ -497,7 +527,7 @@ class OperateDyn
 	def BuildService(service,flag,shiftfrom,shifto)
 		puts "Generating the geo service data"
 		@@conf = LoadConfig.new()
-		@@conf.SetConfFile = "dyn.yml"
+		@@conf.SetConfFile #= "dyn.yml"
 		@@conf.GetHandler
 		@regions = @@conf.GetRegions
 		@dcs = @@conf.GetDcs
@@ -512,7 +542,7 @@ class OperateDyn
 			@labels = []
 			@weights = []
 			@countries = @@conf.GetCountries(region)
-			@dcs = @@conf.GetDcsEnabled(region)
+			@dcs = @@conf.GetDcsEnabled(region,service)
 			if (flag == "dc")
 				if @dcs.include? "#{shiftfrom}"
 					@dcs = @dcs - @shiftfrom
@@ -633,7 +663,7 @@ class Restcall
 		PublishDyn(zone)
 	end
 	# Generating or modifying Geo service
-	def GenerateGeoService(service,zone,record_data,flag)
+	def GenerateGeoService(service,record_data,flag)
 		@record_data = record_data
 		@url = URI.parse("https://api2.dynect.net/REST/Geo/#{service}/")
 		if flag == "create"
@@ -643,7 +673,7 @@ class Restcall
 			puts "Changing geo service"
 			PutDyn()
 		end
-	        PublishDyn(zone)
+	        #PublishDyn(zone)
 	end
 	# Generating geo node and attaching to service
 	def GenerateGeoNode(service,zone,geonode)
@@ -659,9 +689,11 @@ class Restcall
 		@record_data = { :rdata => { :cname => "#{arecord}" }, :ttl => "0" }
 		if (flag == "post")
 			puts "Adding cname record"
+			puts "arecord #{arecord}, cname: #{cname}"
 			PostDyn()
 		elsif (flag == "put")
 			puts "Changing cname record"
+			puts "arecord #{arecord}, cname: #{cname}"
 			PutDyn()
 		end
                 PublishDyn(zone)
@@ -680,14 +712,13 @@ class Restcall
 		PublishDyn(zone)
 	end
 	# deleting service
-	def DeleteService(service,zone)
+	def DeleteService(service)
 		@url = URI.parse("https://api2.dynect.net/REST/Geo/#{service}/")
 		DeleteDyn()
-		PublishDyn(zone)
+		#PublishDyn(zone)
 	end
 	# get method to dyn
 	def GetDyn()
-		puts "Getting data from dyn"
 		@headers = { "Content-Type" => 'application/json', 'Auth-Token' => @auth_token }
 		@resp, @data = @http.get(@url.path, @headers)
 		@result = JSON.parse(@data)
@@ -761,6 +792,12 @@ class Restcall
 		@geonode = @result['data']['rdata']['cname'].chomp('.')
 		return(@geonode)
 	end
+	def CreateZone(zone)
+		@url = URI.parse("https://api2.dynect.net/REST/Zone/#{zone}/")
+		@record_data = { :rname => "ops@outbrain.com", :ttl => "3600" }
+		PostDyn()
+		PublishDyn(zone)
+	end
 	def PrintNodes(nodes)
 		nodes.each do |node|
 			puts node['fqdn']

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ariel Moskovich
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-23 00:00:00 +03:00
+date: 2013-09-07 00:00:00 +03:00
 default_executable: 
 dependencies: []