Merge branch 'OCF35-create-new-helper-ccf-service' into 'staging' (34b7fd88) · Commits · OCF / capif

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -84,7 +84,7 @@ class InvokerManagementOperations(Resource):
	invoker_dict["username"]=username		invoker_dict["username"]=username
	invoker_dict["uuid"]=uuid		invoker_dict["uuid"]=uuid

	mycol.insert_one(apiinvokerenrolmentdetail.to_dict())		mycol.insert_one(invoker_dict)

	current_app.logger.debug("Invoker inserted in database")		current_app.logger.debug("Invoker inserted in database")
	current_app.logger.debug("Netapp onboarded sucessfuly")		current_app.logger.debug("Netapp onboarded sucessfuly")

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@ class MongoDatabse():
	self.config = Config().get_config()		self.config = Config().get_config()
	self.db = self.__connect()		self.db = self.__connect()
	self.invoker_enrolment_details = self.config['mongo']['col']		self.invoker_enrolment_details = self.config['mongo']['col']
	self.capif_users = self.config['mongo']['capif_users_col']
	self.service_col = self.config['mongo']["service_col"]		self.service_col = self.config['mongo']["service_col"]
	self.certs_col = self.config['mongo']['certs_col']		self.certs_col = self.config['mongo']['certs_col']

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -3,20 +3,12 @@ mongo: {
	'password': 'example',		'password': 'example',
	'db': 'capif',		'db': 'capif',
	'col': 'invokerdetails',		'col': 'invokerdetails',
	'capif_users_col': "user",
	'certs_col': "certs",		'certs_col': "certs",
	'service_col': 'serviceapidescriptions',		'service_col': 'serviceapidescriptions',
	'host': 'mongo',		'host': 'mongo',
	'port': "27017"		'port': "27017"
	}		}
	mongo_register: {
	'user': 'root',
	'password': 'example',
	'db': 'capif_users',
	'col': 'user',
	'host': 'mongo_register',
	'port': '27017'
	}
	ca_factory: {		ca_factory: {
	"url": "vault",		"url": "vault",
	"port": "8200",		"port": "8200",

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@ class MongoDatabse():
	self.config = Config().get_config()		self.config = Config().get_config()
	self.db = self.__connect()		self.db = self.__connect()
	self.provider_enrolment_details = self.config['mongo']['col']		self.provider_enrolment_details = self.config['mongo']['col']
	self.capif_users = self.config['mongo']['capif_users']
	self.certs_col = self.config['mongo']['certs_col']		self.certs_col = self.config['mongo']['certs_col']

	def get_col_by_name(self, name):		def get_col_by_name(self, name):

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -4,19 +4,10 @@ mongo: {
	'db': 'capif',		'db': 'capif',
	'col': 'providerenrolmentdetails',		'col': 'providerenrolmentdetails',
	'certs_col': "certs",		'certs_col': "certs",
	'capif_users': 'user',
	'host': 'mongo',		'host': 'mongo',
	'port': "27017"		'port': "27017"
	}		}

	mongo_register: {
	'user': 'root',
	'password': 'example',
	'db': 'capif_users',
	'col': 'user',
	'host': 'mongo_register',
	'port': '27017'
	}

	ca_factory: {		ca_factory: {
	"url": "vault",		"url": "vault",