ocp_registry 0.0.1.alpha → 0.0.5.pre

data/lib/ocp_registry/cloud_manager/mock/mock.rb

@@ -119,9 +119,9 @@ module Ocp::Registry
 
 			def create_tenant(name, description, enabled = true)
       tenant = {
-        :name => "your project name",
-        :description => "your project description",
-        :enabled => true,
+        :name => name,
+        :description => description,
+        :enabled => enabled,
         :id => "1bb0fed1c2df4b5faa19e7700c049e35"
       }
       Model.new tenant
@@ -133,13 +133,14 @@ module Ocp::Registry
         :enabled => true,
         :name => name,
         :tenant_id => tenant_id, 
-        :password => password
+        :password => password, 
+        :id => "2df4b5faa19c049e351bb0fed1caa19e7700"
       }
       Model.new user
       end
 
       def get_tenant_by_name(name)
-    	nil
+    	 nil
       end
 
       def tenant_add_user_with_role(tenant, user_id, role_id)
@@ -147,14 +148,7 @@ module Ocp::Registry
       end
 
       def find_user_by_name(name)
-    	user = {
-        :email => "#{name}@email.com",
-        :enabled => true,
-        :name => name,
-        :tenant_id => "1bb0fed1c2df4b5faa19e7700c049e35",
-        :password => "passwordxxxxx"
-    	}
-      Model.new user
+    	 nil
       end
 
 			NOVA_QUOTA_FIELDS = ["metadata_items",

data/lib/ocp_registry/common.rb

@@ -1,5 +1,7 @@
 module Ocp::Registry::Common
 
+		EMAIL_REGEX = /[a-z0-9_.-]+@[a-z0-9-]+\.[a-z.]+/
+
 	class << self
 
 		def uuid
@@ -11,7 +13,7 @@ module Ocp::Registry::Common
 		end
 
 		def parse_email(email)
-			return unless email =~ /[a-z0-9_.-]+@[a-z0-9-]+\.[a-z.]+/
+			return unless email =~ EMAIL_REGEX
 				email =~ /([a-z0-9_.-]+)@([a-z0-9-]+\.[a-z.]+)/
 				{
 					:name => $1 ,

data/lib/ocp_registry/config.rb

@@ -51,7 +51,7 @@ module Ocp::Registry
 
     def migrate_db
       Sequel.extension :migration
-      Sequel::Migrator.apply(@db,File.expand_path('./lib/ocp_registry/db'))
+      Sequel::Migrator.apply(@db,File.expand_path(File.join(File.dirname(__FILE__), 'db')))
     end
 
     def connect_db(db_config)
@@ -86,6 +86,10 @@ module Ocp::Registry
         raise ConfigError, "Cloud configuration is missing from config file"
       end
 
+      if config["cloud"]["login_url"].nil?
+        raise ConfigError, "Cloud Login URL is missing from config file"
+      end
+
       if config["cloud"]["plugin"].nil?
         raise ConfigError, "Cloud plugin is missing from config file"
       end

data/lib/ocp_registry/db/002_create_settings_table.rb

@@ -0,0 +1,13 @@
+
+Sequel.migration do
+	change do
+		create_table(:registry_settings) do
+      primary_key :id
+      foreign_key :registry_application_id , :registry_applications
+      String :updated_at
+      Integer :version, :default => 0
+      String :comments , :text => true
+      String :settings , :null => false , :text => true
+    end
+  end
+end

data/lib/ocp_registry/db/003_alter_comments_column_in_applications_table.rb

@@ -0,0 +1,13 @@
+Sequel.migration do
+	change do
+		#migration data
+		self[:registry_settings].insert([:registry_application_id, :settings, :comments, :updated_at],
+    	self[:registry_applications].select(:id, :settings, :comments, :updated_at))
+		#drop column
+		alter_table(:registry_applications) do
+			drop_column :comments
+			drop_column :settings
+			rename_column :updated_at, :end_at
+		end
+	end
+end

data/lib/ocp_registry/db/004_add_from_field_for_settings.rb

@@ -0,0 +1,13 @@
+Sequel.migration do 
+	change do 
+		alter_table(:registry_settings) do
+			add_column :from , String, :null => false, :default => 'USER'
+		end
+		settings = self[:registry_settings].select(:id,:version)
+		admins = []
+		settings.each do |set|
+			admins <<  set[:id] if (set[:version] & 1) == 1
+		end
+		self[:registry_settings].where(:id => admins).update(:from => 'ADMIN')
+ 	end
+end

data/lib/ocp_registry/mail_client.rb

@@ -7,7 +7,7 @@ module Ocp::Registry
 		DEFAULT_WORKER = 1
 		DEFAULT_PORT = '25' 
 		DEFAULT_HELO = 'ocp.com'
-		TEMPLATES_PATH = 'mail_template'
+		TEMPLATES_PATH = File.join(File.dirname(__FILE__),'../../mail_template')
 		DEFAULT_FROM = 'registry@ocp.com'
 		DEFAULT_TLS = false
 		DEFAULT_ADMIN_EMAIL = 'admin@ocp.com'
@@ -54,7 +54,7 @@ module Ocp::Registry
 
 		def mail_validated?(mail_info)
 			unless mail_info[:from] && mail_info[:to] && mail_info[:template] && has_template?(mail_info[:template])
-				@logger.waring "Mail is ignored because less of necessary fields "
+				@logger.warning "Mail is ignored because less of necessary fields "
 				return false
 			end
 				true

data/lib/ocp_registry/models.rb

@@ -4,4 +4,5 @@ module Ocp::Registry
   end
 end
 
-require "ocp_registry/models/registry_application"
+require "ocp_registry/models/registry_application"
+require "ocp_registry/models/registry_setting"

data/lib/ocp_registry/models/registry_application.rb

@@ -6,5 +6,24 @@ module Ocp::Registry::Models
   		values[:created_at] = Time.now.utc.to_s
   		values[:state] = 'PENDING'
   	end
+
+  	one_to_many :registry_settings, :select => [:id ,:comments, :settings, :updated_at, :from], :order => :version
+
+  	def to_hash(opts = {})
+  		hash = self.values
+  		if false == opts[:lazy_load]
+  			settings = []
+  			self.registry_settings do |data|
+          limit = opts[:limit]
+          data = data.limit(limit) if limit
+          data.reverse(:version).each do |set|
+    				settings << set.to_hash
+          end
+  			end
+  			hash[:registry_settings] = settings
+  		end
+  		Ocp::Registry::Common.deep_copy(hash)
+  	end
+
   end
 end

data/lib/ocp_registry/models/registry_setting.rb

@@ -0,0 +1,7 @@
+module Ocp::Registry::Models
+  class RegistrySetting < Sequel::Model
+  	def before_create
+  		values[:updated_at] = Time.now.utc.to_s
+  	end
+  end
+end

data/lib/ocp_registry/version.rb

@@ -1,3 +1,3 @@
 module OcpRegistry
-  VERSION = "0.0.1.alpha"
+  VERSION = "0.0.5.pre"
 end

data/mail_template/approve_admin.erb

@@ -1,9 +1,10 @@
 From: <%= mail[:from]%>
 To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
-Subject: Approved resource request for project <%= info[:app_info].project %>
+Subject: APPROVED resource request for project <%= info[:app_info].project %>
 
 Dear Administrator :
-	The resource request for project [<%= info[:app_info].project %>] has been APPROVED at [<%= info[:app_info].created_at %>].
+
+	The resource request for project [<%= info[:app_info].project %>] has been [APPROVED] at [<%= info[:app_info].end_at %>].
 	The application id is [<%= info[:app_info].id%>].
 
 	You can review all received applications from <%= info[:applications_link]%>

data/mail_template/approve_user.erb

@@ -1,9 +1,10 @@
 From: <%= mail[:from]%>
 To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
-Subject: Approved resource request for project <%= info[:app_info].project %>
+Subject: APPROVED resource request for project <%= info[:app_info].project %>
 
 Dear User from <%= info[:app_info].email %> :
-	Your resource request for project [<%= info[:app_info].project %>] has been APPROVED at [<%= info[:app_info].created_at %>].
+
+	Your resource request for project [<%= info[:app_info].project %>] has been [APPROVED] at [<%= info[:app_info].end_at %>].
 	Your application id is [<%= info[:app_info].id%>].
 
 	Your login info is as below:
@@ -14,8 +15,6 @@ Dear User from <%= info[:app_info].email %> :
 
 	Please reset your password once your login into system.
 	
-	You can browse all your applications from <%= info[:applications_link]%>
-
 	Thanks!
 	OCP registry
 

data/mail_template/cancel_admin.erb

@@ -0,0 +1,13 @@
+From: <%= mail[:from]%>
+To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
+Subject: CANCELED resource request for project <%= info[:app_info].project %>
+
+Dear Administrator :
+
+	The resource request for project [<%= info[:app_info].project %>] has been [CANCELED] at [<%= info[:app_info].end_at %>].
+	The application id is [<%= info[:app_info].id%>].
+
+	Thanks!
+	OCP registry
+
+(This email is auto-sent by system, please don't reply this mail)

data/mail_template/cancel_user.erb

@@ -0,0 +1,13 @@
+From: <%= mail[:from]%>
+To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
+Subject: CANCELED resource request for project <%= info[:app_info].project %>
+
+Dear User from <%= info[:app_info].email %> :
+
+	Your resource request for project [<%= info[:app_info].project %>] has been [CANCELED] at [<%= info[:app_info].end_at %>].
+	Your application id is [<%= info[:app_info].id%>].
+
+	Thanks!
+	OCP registry
+
+(This email is auto-sent by system, please don't reply this mail)

data/mail_template/modify.erb

@@ -0,0 +1,25 @@
+From: <%= mail[:from]%>
+To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
+Subject: UPDATED resource request for project <%= info[:app_info].project %> from <%= info[:from] %>
+
+Dear <%= info[:name] %> :
+
+	The resource request for project [<%= info[:app_info].project %>] has been [UPDATED] by [<%= info[:from]%>] at [<%= info[:time]%>].
+	The application id is [<%= info[:app_info].id%>].
+
+	<% unless info[:change_set].empty?%>
+	The change set is as below :
+		<% info[:change_set].each do |change|%>
+			<%= change[:key]%>  : <%= change[:from]%>  ==> <%= change[:to]%>
+		<% end %>
+	<% end %>
+
+	The comment is :
+		<%= info[:comments] %>
+		
+	You can review or apply the settings from <%= info[:application_link]%>
+
+	Thanks!
+	OCP registry
+
+(This email is auto-sent by system, please don't reply this mail)

data/mail_template/refuse_admin.erb

@@ -1,12 +1,13 @@
 From: <%= mail[:from]%>
 To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
-Subject: Refused resource request for project <%= info[:app_info].project %>
+Subject: REFUSED resource request for project <%= info[:app_info].project %>
 
 Dear Administrator :
-	The resource request for project [<%= info[:app_info].project %>] has been REFUSED at [<%= info[:app_info].created_at %>].
+
+	The resource request for project [<%= info[:app_info].project %>] has been [REFUSED] at [<%= info[:app_info].end_at %>]].
 	The application id is [<%= info[:app_info].id%>].
 	The comment is :
-		<%= info[:app_info].comments %>
+		<%= info[:comments] %>
 		
 	You can review all received applications from <%= info[:applications_link]%>
 

data/mail_template/refuse_user.erb

@@ -1,15 +1,15 @@
 From: <%= mail[:from]%>
 To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
-Subject: Refused resource request for project <%= info[:app_info].project %>
+Subject: REFUSED resource request for project <%= info[:app_info].project %>
 
 Dear User from <%= info[:app_info].email %> :
-	Your resource request for project [<%= info[:app_info].project %>] has been REFUSED at [<%= info[:app_info].created_at %>].
+
+	Your resource request for project [<%= info[:app_info].project %>] has been [REFUSED] at [<%= info[:app_info].end_at %>]].
 	Your application id is [<%= info[:app_info].id%>].
 	The comment is :
-		<%= info[:app_info].comments %>
+		<%= info[:comments] %>
 	
 	You can browse your application from <%= info[:application_link]%>.
-	You can browse all your applications from <%= info[:applications_link]%>
 
 	Thanks!
 	OCP registry

data/mail_template/request_admin.erb

@@ -1,9 +1,10 @@
 From: <%= mail[:from]%>
 To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
-Subject: Received resource request for project <%= info[:app_info].project %>
+Subject: RECEIVED resource request for project <%= info[:app_info].project %>
 
 Dear Administrator :
-	A new resource request for project [<%= info[:app_info].project %>] has been RECEIVED at [<%= info[:app_info].created_at %>].
+
+	A new resource request for project [<%= info[:app_info].project %>] has been [RECEIVED] at [<%= info[:app_info].created_at %>].
 	The application id is [<%= info[:app_info].id%>].
 	You can review the application from <%= info[:application_link]%>.
 	You can also have a quick browse all received applications from <%= info[:applications_link]%>.

data/mail_template/request_user.erb

@@ -1,12 +1,12 @@
 From: <%= mail[:from]%>
 To: <%= mail[:to].kind_of?(Array)? mail[:to].join(";") : mail[:to]%>
-Subject: Received resource request for project <%= info[:app_info].project %>
+Subject: RECEIVED resource request for project <%= info[:app_info].project %>
 
 Dear User from <%= info[:app_info].email %> :
-	Your resource request for project [<%= info[:app_info].project %>] has been RECEIVED at [<%= info[:app_info].created_at %>].
+
+	Your resource request for project [<%= info[:app_info].project %>] has been [RECEIVED] at [<%= info[:app_info].created_at %>].
 	Your application id is [<%= info[:app_info].id%>].
 	You can browse your application from <%= info[:application_link]%>.
-	You can also have a quick browse all your applications from <%= info[:applications_link]%>.
 	We will process your application as soon as possible.
 	We will send you another email once we completed process your request.
 

data/public/comment_dialog.css

@@ -0,0 +1,11 @@
+.comment-dialog {
+	width: 400px;
+	margin-left: -200px;
+}
+
+.comment-dialog textarea {
+	width: 360px;
+	height: 200px;
+	resize: none;
+	margin-left: 12px;
+}

data/public/common.css

@@ -1,14 +1,17 @@
-.bordered {
-	border: 1px solid #ddd;
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-	
-	padding: 10px 10px 10px 10px;
+.clear-float {
+	clear: both;
 }
 
-.clear {
-	clear: both;
+.hidden {
+	display: none;
+}
+
+.to-right {
+	float: right;
+}
+
+.to-left {
+	float: left;
 }
 
 select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
@@ -20,85 +23,45 @@ input, textarea, .uneditable-input {
 	width: 260px;
 }
 
-.optDialog {
-	width: 600px;
-	margin: auto;
+.box {
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
 	
-	margin-top: 80px;
-	margin-bottom: 80px;
-}
-
-.optDialog  .tab-content{
-	margin-left: 5px;
-	margin-right: 5px;
-}
-
-.optDialog label {
-	font-weight: bold;
+	padding: 10px 10px 10px 10px;
 }
 
-.optDialog .tab-content {
-	border-right: 1px solid #ddd;
-	width: 280px;
-	float: left;
+.dialog {
+	width: 600px;
+	margin: auto;
 }
 
-.optDialog .optExplaination{
-	float: left;
-	overflow: hidden;
-	width: 290px;
-	margin-left: 12px;
+.dialog {
+	border: 1px solid #ddd;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	
+	padding: 10px 10px 10px 10px;
 }
 
-.optDialog .optAction {
+.dialog .action {
 	border-top: 1px solid #ddd;
-	padding: 15px 10px 10px 10px;
+	padding: 10px 10px 0px 10px;
 	margin-top: 10px;
 }
 
-.toLeft{
-	float: left;
-}
-
-.toRight{
-	float: right;
-}
-
-.optDialog button{
+.dialog button {
 	width: 100px;
 }
 
-.optDialog button.toRight {
-	margin-left: 10px;
+.dialog .action *.to-left {
+	margin-right: 10px;
 }
 
-.optDialog .loadingIcon{
+.dialog .action *.to-right {
 	margin-left: 10px;
-	display: none;
-}
-
-.rejectCommentDialog {
-	width: 400px;
-}
-
-.rejectCommentDialog textarea {
-	width: 360px;
-	height: 200px;
-	resize: none;
-	margin-left: 12px;
-}
-
-.rejectCommentDialog .rejectCommentAction {
-	border-top: 1px solid #ddd;
-	padding: 15px 10px 5px 10px;
-	margin-top: 10px;
 }
 
-.rejectCommentDialog button{
-	width: 100px;
-}
-
-.rejectCommentDialog button.toRight {
-	margin-left: 10px;
-}