Issue #IQ-193 feat: updated config for content & assessment service

ansible/roles/stack-sunbird/templates/assessment-service_application.conf

@@ -426,6 +426,7 @@ cloud_storage_container: "{{ cloud_storage_content_bucketname }}"
 cloudstorage {
   metadata.replace_absolute_path={{ cloudstorage_replace_absolute_path | default('false') }}
   metadata.list={{ cloudstorage_metadata_list }}
+  relative_path_prefix="{{ cloudstorage_relative_path_prefix | default('CLOUD_STORAGE_BASE_PATH') }}"
   read_base_path="{{ cloudstorage_base_path }}"
   write_base_path={{ valid_cloudstorage_base_urls }}
 }

ansible/roles/stack-sunbird/templates/content-service_application.conf

@@ -481,10 +481,12 @@ composite {
     url : "{{ sunbird_search_service_api_base_url }}/v3/search"
   }
 }
-cloud_storage_type: "azure"
-azure_storage_key: "{{ sunbird_public_storage_account_name }}"
-azure_storage_secret: "{{ sunbird_public_storage_account_key }}"
-azure_storage_container: "{{ sunbird_content_azure_storage_container }}"
+
+cloud_storage_type: "{{ cloud_service_provider }}"
+cloud_storage_key: "{{ cloud_public_storage_accountname }}"
+cloud_storage_secret: "{{ cloud_public_storage_secret }}"
+cloud_storage_endpoint: "{{ cloud_public_storage_endpoint }}"
+cloud_storage_container: "{{ cloud_storage_content_bucketname }}"
 
 # Google Drive APIKEY
 learning_content_drive_apiKey = "{{ learning_content_drive_apiKey }}"
@@ -492,7 +494,8 @@ learning_content_drive_apiKey = "{{ learning_content_drive_apiKey }}"
 kafka {
   urls : "{{ kafka_urls }}"
   topic.send.enable : true
-  topics.instruction : "{{ env_name }}.learning.job.request"
+  topics.instruction : "{{ env_name }}.{{ bb_name}}.learning.job.request"
+  publish.request.topic : "{{ env_name }}.{{ bb_name}}.publish.job.request"
 }
 
 # DIAL Link Config
@@ -500,15 +503,23 @@ dial_service {
   api {
     base_url : "http://dial-service.{{namespace}}.svc.cluster.local:9000"
     auth_key : "{{ sunbird_dial_repo_api_key }}"
+    search   : "/dialcode/v3/search"
+    generate : "/dialcode/v3/generate"
   }
 }
+
+reserve_dialcode {
+    mimeType : ["application/vnd.ekstep.content-collection"]
+    max_count : 250
+}
+
 content.link_dialcode.validation=true
 content.link_dialcode.max_limit=10
 
 # Content Import API Config
 import {
   request_size_limit : 1000
-  output_topic_name : "{{ env_name }}.auto.creation.job.request"
+  output_topic_name : "{{ env_name }}.{{ bb_name}}.auto.creation.job.request"
   required_props : {{ content_import_required_props }}
   remove_props : {{ content_import_remove_props }}
 }
@@ -594,37 +605,45 @@ master.category.validation.enabled="{{ master_category_validation_enabled }}"
 #Collection CSV 
 sunbird_dialcode_search_api="http://dial-service.{{namespace}}.svc.cluster.local:9000/dialcode/v3/list"
 framework_read_api_url="{{ sunbird_content_repo_api_base_url }}/framework/v3/read"
-sunbird_link_dial_code_api="{{ sunbird_content_repo_api_base_url }}/collection/v3/dialcode/link"
+sunbird_link_dial_code_api="{{ sunbird_content_service_api_base_url }}/collection/v4/dialcode/link"
 
 
 collection {
-	csv {
-		maxRows = 6500
-		allowedContentTypes = ["TextBook","Collection","Course"]
-		maxFirstLevelUnits=30
-		ttl = 86400
-		maxUnitFieldLength=120
-        	maxDescFieldLength=1500
-		contentTypeToUnitType = {"TextBook": "TextBookUnit", "Course": "CourseUnit", "Collection":"Collection"}
-		headers {
-			folderIdentifier = ["Folder Identifier"]
-			hierarchy = ["Level 1 Folder","Level 2 Folder","Level 3 Folder","Level 4 Folder"]
-			QR = ["QR Code Required?","QR Code"]
-			topics = ["Mapped Topics"]
-			collectionName = ["Collection Name"]
-			linkedContents = ["Linked Content 1","Linked Content 2","Linked Content 3","Linked Content 4","Linked Content 5","Linked Content 6","Linked Content 7","Linked Content 8","Linked Content 9","Linked Content 10","Linked Content 11","Linked Content 12","Linked Content 13","Linked Content 14","Linked Content 15","Linked Content 16","Linked Content 17","Linked Content 18","Linked Content 19","Linked Content 20","Linked Content 21","Linked Content 22","Linked Content 23","Linked Content 24","Linked Content 25","Linked Content 26","Linked Content 27","Linked Content 28","Linked Content 29","Linked Content 30"]
-			output = ["Collection Name","Folder Identifier","Level 1 Folder","Level 2 Folder","Level 3 Folder","Level 4 Folder","Description","Mapped Topics","Keywords","QR Code Required?","QR Code","Linked Content 1","Linked Content 2","Linked Content 3","Linked Content 4","Linked Content 5","Linked Content 6","Linked Content 7","Linked Content 8","Linked Content 9","Linked Content 10","Linked Content 11","Linked Content 12","Linked Content 13","Linked Content 14","Linked Content 15","Linked Content 16","Linked Content 17","Linked Content 18","Linked Content 19","Linked Content 20","Linked Content 21","Linked Content 22","Linked Content 23","Linked Content 24","Linked Content 25","Linked Content 26","Linked Content 27","Linked Content 28","Linked Content 29","Linked Content 30"]
-			sequence {
-				create = {"Level 1 Folder":0,"Level 2 Folder":1,"Level 3 Folder":2,"Level 4 Folder":3,"Description":4}
-				update = {"Collection Name":0,"Folder Identifier":1,"Level 1 Folder":2,"Level 2 Folder":3,"Level 3 Folder":4,"Level 4 Folder":5,"Description":6,"Mapped Topics":7,"Keywords":8,"QR Code Required?":9,"QR Code":10,"Linked Content 1":11,"Linked Content 2":12,"Linked Content 3":13,"Linked Content 4":14,"Linked Content 5":15,"Linked Content 6":16,"Linked Content 7":17,"Linked Content 8":18,"Linked Content 9":19,"Linked Content 10":20,"Linked Content 11":21,"Linked Content 12":22,"Linked Content 13":23,"Linked Content 14":24,"Linked Content 15":25,"Linked Content 16":26,"Linked Content 17":27,"Linked Content 18":28,"Linked Content 19":29,"Linked Content 20":30,"Linked Content 21":31,"Linked Content 22":32,"Linked Content 23":33,"Linked Content 24":34,"Linked Content 25":35,"Linked Content 26":36,"Linked Content 27":37,"Linked Content 28":38,"Linked Content 29":39,"Linked Content 30":40}
-				linkedContents = {"Linked Content 1":0,"Linked Content 2":1,"Linked Content 3":2,"Linked Content 4":3,"Linked Content 5":4,"Linked Content 6":5,"Linked Content 7":6,"Linked Content 8":7,"Linked Content 9":8,"Linked Content 10":9,"Linked Content 11":10,"Linked Content 12":11,"Linked Content 13":12,"Linked Content 14":13,"Linked Content 15":14,"Linked Content 16":15,"Linked Content 17":16,"Linked Content 18":17,"Linked Content 19":18,"Linked Content 20":19,"Linked Content 21":20,"Linked Content 22":21,"Linked Content 23":22,"Linked Content 24":23,"Linked Content 25":24,"Linked Content 26":25,"Linked Content 27":26,"Linked Content 28":27,"Linked Content 29":28,"Linked Content 30":29}
-			}
-		}
-		mandatory {
-			create = ["Level 1 Folder"]
-			update = ["Collection Name","Folder Identifier"]
-		}
-	}
+  csv {
+    maxRows = 6500
+    allowedContentTypes = ["TextBook","Collection","Course"]
+    maxFirstLevelUnits=30
+    ttl = 86400
+    maxUnitFieldLength=120
+          maxDescFieldLength=1500
+    contentTypeToUnitType = {"TextBook": "TextBookUnit", "Course": "CourseUnit", "Collection":"Collection"}
+    headers {
+      folderIdentifier = ["Folder Identifier"]
+      hierarchy = ["Level 1 Folder","Level 2 Folder","Level 3 Folder","Level 4 Folder"]
+      QR = ["QR Code Required?","QR Code"]
+      topics = ["Mapped Topics"]
+      collectionName = ["Collection Name"]
+      linkedContents = ["Linked Content 1","Linked Content 2","Linked Content 3","Linked Content 4","Linked Content 5","Linked Content 6","Linked Content 7","Linked Content 8","Linked Content 9","Linked Content 10","Linked Content 11","Linked Content 12","Linked Content 13","Linked Content 14","Linked Content 15","Linked Content 16","Linked Content 17","Linked Content 18","Linked Content 19","Linked Content 20","Linked Content 21","Linked Content 22","Linked Content 23","Linked Content 24","Linked Content 25","Linked Content 26","Linked Content 27","Linked Content 28","Linked Content 29","Linked Content 30"]
+      output = ["Collection Name","Folder Identifier","Level 1 Folder","Level 2 Folder","Level 3 Folder","Level 4 Folder","Description","Mapped Topics","Keywords","QR Code Required?","QR Code","Linked Content 1","Linked Content 2","Linked Content 3","Linked Content 4","Linked Content 5","Linked Content 6","Linked Content 7","Linked Content 8","Linked Content 9","Linked Content 10","Linked Content 11","Linked Content 12","Linked Content 13","Linked Content 14","Linked Content 15","Linked Content 16","Linked Content 17","Linked Content 18","Linked Content 19","Linked Content 20","Linked Content 21","Linked Content 22","Linked Content 23","Linked Content 24","Linked Content 25","Linked Content 26","Linked Content 27","Linked Content 28","Linked Content 29","Linked Content 30"]
+      sequence {
+        create = {"Level 1 Folder":0,"Level 2 Folder":1,"Level 3 Folder":2,"Level 4 Folder":3,"Description":4}
+        update = {"Collection Name":0,"Folder Identifier":1,"Level 1 Folder":2,"Level 2 Folder":3,"Level 3 Folder":4,"Level 4 Folder":5,"Description":6,"Mapped Topics":7,"Keywords":8,"QR Code Required?":9,"QR Code":10,"Linked Content 1":11,"Linked Content 2":12,"Linked Content 3":13,"Linked Content 4":14,"Linked Content 5":15,"Linked Content 6":16,"Linked Content 7":17,"Linked Content 8":18,"Linked Content 9":19,"Linked Content 10":20,"Linked Content 11":21,"Linked Content 12":22,"Linked Content 13":23,"Linked Content 14":24,"Linked Content 15":25,"Linked Content 16":26,"Linked Content 17":27,"Linked Content 18":28,"Linked Content 19":29,"Linked Content 20":30,"Linked Content 21":31,"Linked Content 22":32,"Linked Content 23":33,"Linked Content 24":34,"Linked Content 25":35,"Linked Content 26":36,"Linked Content 27":37,"Linked Content 28":38,"Linked Content 29":39,"Linked Content 30":40}
+        linkedContents = {"Linked Content 1":0,"Linked Content 2":1,"Linked Content 3":2,"Linked Content 4":3,"Linked Content 5":4,"Linked Content 6":5,"Linked Content 7":6,"Linked Content 8":7,"Linked Content 9":8,"Linked Content 10":9,"Linked Content 11":10,"Linked Content 12":11,"Linked Content 13":12,"Linked Content 14":13,"Linked Content 15":14,"Linked Content 16":15,"Linked Content 17":16,"Linked Content 18":17,"Linked Content 19":18,"Linked Content 20":19,"Linked Content 21":20,"Linked Content 22":21,"Linked Content 23":22,"Linked Content 24":23,"Linked Content 25":24,"Linked Content 26":25,"Linked Content 27":26,"Linked Content 28":27,"Linked Content 29":28,"Linked Content 30":29}
+      }
+    }
+    mandatory {
+      create = ["Level 1 Folder"]
+      update = ["Collection Name","Folder Identifier"]
+    }
+  }
 }
 
 plugin.media.base.url="{{ plugin_media_base_url }}"
+
+cloudstorage {
+  metadata.replace_absolute_path={{ cloudstorage_replace_absolute_path | default('false') }}
+  relative_path_prefix="{{ cloudstorage_relative_path_prefix | default('CLOUD_STORAGE_BASE_PATH') }}"
+  metadata.list={{ cloudstorage_metadata_list }}
+  read_base_path="{{ cloudstorage_base_path }}"
+  write_base_path={{ valid_cloudstorage_base_urls }}
+}
\ No newline at end of file