Changeset 8408

Timestamp:

26/06/12 14:21:46 (9 years ago)

Author:

mnagni

Message:

# 22505: Use the CedaMoles? python package
removed the ceda_moles folders and verified the imports

Location:

mauRepo/MolesManager/trunk

Files:

• resources/requirements.txt (modified) (1 diff)
• src/MolesManager/codelist.py (added)
• src/MolesManager/moles3epb.py (modified) (3 diffs)
• src/MolesManager/settings.py (modified) (1 diff)
• src/MolesManager/views/cedaObservationView.py (modified) (1 diff)
• src/ascore (deleted)
• src/ea_model (deleted)
• src/earootclass.py (deleted)
• src/libs/migration/processor/commons.py (modified) (4 diffs)
• src/libs/migration/processor/dataEntity.py (modified) (3 diffs)
• src/libs/migration/processor/deployment.py (modified) (17 diffs)
• src/libs/migration/processor/deployment_data.py (modified) (2 diffs)
• src/sqlTables.py (deleted)

mauRepo/MolesManager/trunk/resources/requirements.txt

@@ -7 +7 @@
 #This package should be available in the machine where CedaManager will be deployed
 #psycopg2==2.4.2
+
+# CEDA PACKAGES please add something like
+# --extra-index-url http://ciprod1.cems.rl.ac.uk/pip
+# to your pip install 
+ceda-moles-model==0.1.0

mauRepo/MolesManager/trunk/src/MolesManager/moles3epb.py

@@ -34 +34 @@
 from ea_model.ceda_metadatamodel.ceda_observationcollection.ceda_observationcollection import CEDA_ObservationCollection
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
-from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation
 from ea_model.moles3_4.observationcollection.mo_observationcollection import MO_ObservationCollection
 from ea_model.moles3_4.observation.mo_observation import MO_Observation
@@ -42 +40 @@
 from sqlalchemy.orm import mapper
 from MolesManager.ceda_guid import CedaGUID
-from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo
-from ea_model.moles3_4.utilities.mo_rolevalue import MO_RoleValue
 from sqlalchemy.orm.collections import InstrumentedList
+from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier
+from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation
 from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox
 from libs.postgisutil import unifyGeometries, create_st_setSRID
-
 
 class Moles3EPBFactory(EPB):
@@ -204 +201 @@
             @return: True if the collection contains the given observation, False otherwise  
         """
+        
+        # TO FIX!!!
+        
+        '''
         ret = self._session.query(MO_ResponsiblePartyInfo).join(MO_Observation). \
-            filter(MO_ResponsiblePartyInfo.role == MO_RoleValue.cl_author). \
+            filter(MO_ResponsiblePartyInfo.role == CEDA_RoleValue.cl_author). \
             filter(MO_Observation.id == obs_id)       
         return ret
+        '''
+        
 
     def extractObservationByTitleKeywords(self, keywords):

mauRepo/MolesManager/trunk/src/MolesManager/settings.py

@@ -209 +209 @@
 #MOLES3_DB_CONNECTION = 'postgresql://user:pws@host:port/dbName'
 MOLES3_DB_CONNECTION = 'PG_MOLES3_DB_CONNECTION'
-from sqlTables import doTables as doMoles, attachEvents
+from ea_model.sqlTables import doTables as doMoles, attachEvents
 MOLES3_DB_SCRIPT = doMoles
 EVENTS_DB = attachEvents

mauRepo/MolesManager/trunk/src/MolesManager/views/cedaObservationView.py

@@ -7 +7 @@
 from django.core.context_processors import csrf
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
-from MolesManager.moles3epb import Moles3EPB
 from MolesManager.djencoder import DJEncoder
 from django.utils.safestring import mark_safe

mauRepo/MolesManager/trunk/src/libs/migration/processor/commons.py

@@ -32 +32 @@
 '''
 from ea_model.moles3_4.utilities.mo_responsiblepartyinfo import MO_ResponsiblePartyInfo
-from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier
 from httplib import HTTPConnection
 from xml.etree.ElementTree import XML, tostring
 import time, datetime
-from ea_model.upcomingiso.ci_organisation import CI_Organisation
-from ea_model.upcomingiso.ci_party import CI_Party
-from ea_model.upcomingiso.ci_individual import CI_Individual
 from libs.migration.exception.exceptions import NoDataLineage
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation
-from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import DQ_Element
-from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_conformanceresult import DQ_ConformanceResult
 from hashlib import md5
 from xml.sax.saxutils import unescape, escape
@@ -49 +42 @@
 from ea_model.ceda_metadatamodel.ceda_result.ceda_result import CEDA_Result
 from ea_model.moles3_4.result.mo_onlineresource import MO_OnlineResource
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.url import URL
-from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox
 from ea_model.ceda_metadatamodel.ceda_computation.ceda_processing import CEDA_Processing
 from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_instrument import CEDA_Instrument
 from ea_model.ceda_metadatamodel.ceda_observationprocess.ceda_compositeprocess import CEDA_CompositeProcess
 from ea_model.ceda_metadatamodel.ceda_acquisition.ceda_acquisition import CEDA_Acquisition
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_date import CI_Date
+from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project
+from ea_model.ceda_metadatamodel.ceda_utilities.ceda_review import CEDA_Review
+from ea_model.iso_19115_2006_metadata_corrigendum.reference_system_information.md_identifier import MD_Identifier
+from ea_model.iso_19115_2006_metadata_corrigendum.identification_information.md_keywords import MD_Keywords
 from ea_model.iso_19103_2005_schema_language.basic_types.primitive.date_and_time.datetime import DateTime
 from ea_model.iso_19103_2005_schema_language.basic_types.primitive.date_and_time.date import Date
 from ea_model.iso_19108_2006_temporal_schema.temporal_reference_system.tm_position import TM_Position
 from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_instant import TM_Instant
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_contact import CI_Contact
+from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period import TM_Period
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_address import CI_Address
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_onlineresource import CI_OnlineResource
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_telephone import CI_Telephone
-from ea_model.iso_19108_2006_temporal_schema.temporal_objects.tm_period import TM_Period
+from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_contact import CI_Contact
+from ea_model.moles3_4.utilities.mo_individual import MO_Individual
+from ea_model.moles3_4.utilities.mo_organisation import MO_Organisation
+from ea_model.moles3_4.utilities import mo_organisation
+from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_date import CI_Date
+from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_citation import CI_Citation
 from ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_constraints import MD_Constraints
 from ea_model.iso_19115_2006_metadata_corrigendum.constraint_information.md_legalconstraints import MD_LegalConstraints
-from ea_model.ceda_metadatamodel.ceda_project.ceda_project import CEDA_Project
+from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_responsibleparty import CI_ResponsibleParty
 from ea_model.iso_19115_2006_metadata_corrigendum.metadata_entity_set_information.md_metadata import MD_Metadata
-from ea_model.ceda_metadatamodel.ceda_utilities.ceda_review import CEDA_Review
-from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_responsibleparty import CI_ResponsibleParty
-from ea_model.iso_19115_2006_metadata_corrigendum.maintenance_information.md_maintenancefrequencycode import MD_MaintenanceFrequencyCode
-from ea_model.iso_19115_2006_metadata_corrigendum.identification_information.md_keywords import MD_Keywords
+from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_conformanceresult import DQ_ConformanceResult
+from ea_model.iso_19115_2006_metadata_corrigendum.extent_information.ex_geographicboundingbox import EX_GeographicBoundingBox
+from ea_model.iso_19115_2006_metadata_corrigendum.data_quality_information.dq_element import DQ_Element
 
 base = '/exist/rest/atoms'
@@ -696 +694 @@
     return ci_contact
 
-def createCI_Individual(name = None, contactInfo = None):
-    '''
-        Creates a new CI_Individual instance
+def createMO_Individual(name = None, contactInfo = None):
+    '''
+        Creates a new MO_Individual instance
         @param name: a String
         @param contactInfo: an array of CI_Contact        
     '''    
-    ci_party = CI_Individual()
+    ci_party = MO_Individual()
     if name:
         ci_party.name = name
@@ -709 +707 @@
     return ci_party
 
-def createCI_Organization(name = None, contactInfo = None):
-    '''
-        Creates a new CI_Individual instance
-        @param name: a String
-        @param contactInfo: an array of CI_Contact        
-    '''    
-    ci_party = CI_Organisation()
-    if name:
-        ci_party.name = name
-    if contactInfo:
-        ci_party.contactInfo = contactInfo        
-    return ci_party
-
 def createMO_Organization(name = None, contactInfo = None):
     '''
         Creates a new MO_Organization instance.
-        TEMPORARILY RETURNS A CI_ORGANIZATION BECAUSE A DB SCHEMA PROBLEM!!!!
         @param name: a String
         @param contactInfo: an array of CI_Contact        
     '''       
-    ci_party = CI_Organisation()
+    ci_party = MO_Organisation()
     if name:
         ci_party.name = name

mauRepo/MolesManager/trunk/src/libs/migration/processor/dataEntity.py

@@ -42 +42 @@
     hasMOBeenProcessed, getAtomDocumentHashByMO, extractTitle
 from libs.migration.processor.deployment import DeploymentProcessor
-from ea_model.moles3_4.utilities.mo_publicationstatevalue import MO_PublicationStateValue
 from logging import StreamHandler
 import logging
 from ea_model.iso_19115_2006_metadata_corrigendum.citation_and_responsible_party_information.ci_datetypecode import CI_DateTypeCode
 from MolesManager.ceda_guid import CedaGUID
+from ea_model.moles3_4.observation.mo_observationpublicationstatevalue import MO_ObservationPublicationStateValue
+from MolesManager.codelist import MM_ObservationPublicationStateValue,\
+    getCLValue
 
 CEDA_TITLE = 'ceda_title'
@@ -124 +126 @@
         if not hasMOBeenProcessed(self._dataEntityMigration):
             docHash = getAtomDocumentHashByMO(self._dataEntityMigration)
-            ceda_observationCollection.publicationState = MO_PublicationStateValue.cl_working
+            ceda_observationCollection.publicationState = getCLValue(MM_ObservationPublicationStateValue.cl_working)
             self.epbRepo.moles3EPB.persistInstance(ceda_observationCollection)
             self.epbRepo.migrationEPB.updateMigrationObject(self._dataEntityMigration, \
@@ -179 +181 @@
         try :
             if self._dataEntityMigration.ceda_observation_coll_id:
-                obsColl = self.epbRepo.moles3EPB.search(CEDA_ObservationCollection, self._dataEntityMigration.ceda_observation_coll_id) 
+                #obsColl = self.epbRepo.moles3EPB.search(CEDA_ObservationCollection, self._dataEntityMigration.ceda_observation_coll_id) 
+                obsColl = self.epbRepo.moles3EPB.searchSelectiveLoad(CEDA_ObservationCollection, self._dataEntityMigration.ceda_observation_coll_id, \
+                                                           ['identifier'])
             else:
                 obsColl = CEDA_ObservationCollection()

mauRepo/MolesManager/trunk/src/libs/migration/processor/deployment.py

@@ -44 +44 @@
     createCI_Contact, createCI_Address, createCI_OnlineResource,\
     createCI_Telephone, extractMolesTemporalRange, isoDateStringToTimeDate,\
-    createTM_Period, createCI_Individual, findAccessLinksInMigrationDocument,\
+    createTM_Period, findAccessLinksInMigrationDocument,\
     findLinksInDeployment, createMD_LegalConstraints,\
     createDQ_Element, createDQ_ConformanceResult, findUpdatedDate,\
@@ -50 +50 @@
     createCI_ResponsibleParty, extractUpdateFrequency,\
     findLinksInMigrationDocument, findSubTypeInDPT, extractMolesPublishedDate,\
-    createMD_Keywords, hasMOBeenProcessed
-from ea_model.moles3_4.utilities.mo_rolevalue import MO_RoleValue
+    createMD_Keywords, hasMOBeenProcessed, createMO_Individual
 from ea_model.ceda_metadatamodel.ceda_observation.ceda_observation import CEDA_Observation
 from libs.epb import EPB
 from libs.migration.processor.deployment_data import DeploymentDataProcessor
-from ea_model.moles3_4.utilities.mo_publicationstatevalue import MO_PublicationStateValue
 from libs.migration.exception.exceptions import NoDataLineage,\
     NoAssociatedAuthor
@@ -74 +72 @@
 from ea_model.iso_19115_2006_metadata_corrigendum.maintenance_information.md_maintenancefrequencycode import MD_MaintenanceFrequencyCode
 from ea_model.ceda_metadatamodel.ceda_result.ceda_curationvalue import CEDA_CurationValue
+from ea_model.moles3_4.utilities.ceda_rolevalue import CEDA_RoleValue
+from ea_model.moles3_4.observation.mo_observationpublicationstatevalue import MO_ObservationPublicationStateValue
+from MolesManager.codelist import MM_RoleValue,\
+    MM_ObservationPublicationStateValue, getCLValue
 
 MET_GEO_FEATURE = 'Meteorological geographical features'
@@ -103 +105 @@
     def _existsCEDAasPublisher(self):
         for rp in self._ceda_observation.relatedParty:
-            if rp.role == MO_RoleValue.cl_publisher:
+            if rp.role == getCLValue(MM_RoleValue.cl_publisher):
                 for party in rp.parties:
                     if party.name == DeploymentProcessor.publisherName:
@@ -199 +201 @@
             
             py_date = None
-            cited_responsible = createCI_ResponsibleParty(role=CI_RoleCode.cl_publisher, \
+            cited_responsible = createCI_ResponsibleParty(role=getCLValue(CI_RoleCode.cl_publisher), \
                                                               organizationName='NERC - British Atmospheric Data Centre')
             if doi.upper() == '10.5285/E8F43A51-0198-4323-A926-FE69225D57DD':
@@ -212 +214 @@
             if py_date:   
                 dt = createDate(py_date)
-                ci_date = createCI_Date(CI_DateTypeCode.cl_publication, date = dt)
+                ci_date = createCI_Date(getCLValue(CI_DateTypeCode.cl_publication), date = dt)
                 i_authority = createCI_Citation("DOI", date = ci_date)
                 identifier = createMD_Identifier(code = doi, authority=i_authority)
@@ -267 +269 @@
                 int_description = "download directly from archive"    
             i_sources.append(createMO_OnlineResource(linkage = dwn['href'], name = dwn['title'], \
-                                                   function = CI_OnLineFunctionCode.cl_download, \
+                                                   function = getCLValue(CI_OnLineFunctionCode.cl_download), \
                                                    description = int_description, applicationProfile = int_applicationProfile))
             
@@ -280 +282 @@
             i_logical_path = infodb_de['logical_path']
                 
-        i_category = ceda_curationvalue.CEDA_CurationValue.cl_a                                    
+        i_category = getCLValue(CEDA_CurationValue.cl_a)                                  
         if infodb_de and infodb_de.has_key('category') and infodb_de['category']:
             i_category = CEDA_CurationValue.from_string(infodb_de['category'].lower())        
@@ -328 +330 @@
         
         if party and not self._deploymentHasBeenProcessed:
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_publisher, [party]))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_custodian, deepcopy([party])))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_distributor, deepcopy([party])))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_pointofcontact, deepcopy([party])))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_metadataowner, deepcopy([party])))
-            observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_curator, deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_publisher), [party]))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_custodian), deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_distributor), deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_pointofcontact), deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_metadataowner), deepcopy([party])))
+            observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_curator), deepcopy([party])))
             return        
         #Still have to update observation.result.source
@@ -346 +348 @@
         if doc_date:
             i_date = createDate(isoDateTimeStringToTimeDate(doc_date))                
-            ci_dates.append(createCI_Date(CI_DateTypeCode.cl_revision, date = i_date))            
+            ci_dates.append(createCI_Date(getCLValue(CI_DateTypeCode.cl_revision), date = i_date))            
         else:
             i_date = createDate(isoDateTimeStringToTimeDate(datetime.datetime.now()))
-            ci_dates.append(createCI_Date(CI_DateTypeCode.cl_creation, date = i_date))
+            ci_dates.append(createCI_Date(getCLValue(CI_DateTypeCode.cl_creation), date = i_date))
 
         i_specification = createCI_Citation(title = "CEDA Data Quality Statement", date=ci_dates)
@@ -504 +506 @@
             if access_link and len(access_link) == 1:
                 i_use_limitation.append("Access to these data is restricted. To obtain access please apply for access at: %s" % (access_link[0]['href']))
-                i_accessConstraints.append(MD_RestrictionCode.cl_restricted)
+                i_accessConstraints.append(getCLValue(MD_RestrictionCode.cl_restricted))
                 observation.permission = createMD_LegalConstraints(useLimitation = i_use_limitation, accessConstrains = i_accessConstraints)
                 
@@ -534 +536 @@
             return
                
-        i_party = createCI_Individual(name = 'Graham Parton')
-        i_reviewer = createMO_ResponsiblePartyInfo(MO_RoleValue.cl_processor, [i_party])
-        ceda_observation.internalReview.append( \
-            createCEDA_Review(reviewer=i_reviewer, reviewFrequency=CEDA_ReviewFrequencyValue.cl_yearly, \
-                              reviewStatus=CEDA_ReviewStatusValue.cl_required))  
+        i_party = createMO_Individual(name = 'Graham Parton')
+        i_reviewer = createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_processor), [i_party])
+        ceda_observation.metadataManagement.append( \
+            createCEDA_Review(reviewer=i_reviewer, reviewFrequency=getCLValue(CEDA_ReviewFrequencyValue.cl_yearly), \
+                              reviewStatus=getCLValue(CEDA_ReviewStatusValue.cl_required)))  
 
     def _assignLanguage(self, ceda_observation):
@@ -546 +548 @@
         i_date_stamp = createDate(datetime.datetime.now())
         #i_contact = createCI_Citation("", date = i_date_stamp)
-        i_contact = createCI_ResponsibleParty(CI_RoleCode.cl_user)
+        i_contact = createCI_ResponsibleParty(getCLValue(CI_RoleCode.cl_user))
         ceda_observation.metadata = createMD_Metadata(date_stamp=i_date_stamp, contact = [i_contact], language = "English")
                         
@@ -582 +584 @@
 
             if len(ret['ind']) > 0:
-                i_party = createCI_Individual(name = ret['ind'][0])
-                observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_author, [i_party]))                 
+                i_party = createMO_Individual(name = ret['ind'][0])
+                observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_author), [i_party]))                 
             if len(ret['org']) > 0:
                 i_party = createMO_Organization(name = ret['org'][0])
-                observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_author, [i_party]))
+                observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_author), [i_party]))
             
             if len(ret['ind']) > 1:
@@ -610 +612 @@
         i_party = []
         for nm in ind_names:
-            i_party.append(createCI_Individual(name = nm))
+            i_party.append(createMO_Individual(name = nm))
                 
         for nm in org_names:
@@ -617 +619 @@
         if i_party:
             if not self._deploymentHasBeenProcessed:
-                observation.relatedParty.append(createMO_ResponsiblePartyInfo(MO_RoleValue.cl_coinvestigator, i_party))
+                observation.relatedParty.append(createMO_ResponsiblePartyInfo(getCLValue(MM_RoleValue.cl_coinvestigator), i_party))
                 return
         #Still have to update observation.permission
@@ -642 +644 @@
         #Is a first time process?
         if not hasMOBeenProcessed(self._deploymentMigration):
-            ceda_observation.publicationState = MO_PublicationStateValue.cl_working            
+            ceda_observation.publicationState = getCLValue(MM_ObservationPublicationStateValue.cl_working)          
             docHash = getAtomDocumentHashByMO(self._dataEntityMigration)
             self.epbRepo.moles3EPB.persistInstance(ceda_observation)        

mauRepo/MolesManager/trunk/src/libs/migration/processor/deployment_data.py

@@ -35 +35 @@
     findSummary, findDocumentationInMigrationDocument, createCI_Citation,\
     createMO_OnlineResource, findLinksInDeployment
-from ea_model.moles3_4.utilities.mo_publicationstatevalue import MO_PublicationStateValue
+from ea_model.moles3_4.utilities.ceda_publicationstatevalue import CEDA_PublicationStateValue
 
 class DeploymentDataProcessor(object):
@@ -64 +64 @@
                     i_documentation = createCI_Citation("Documentation resource")
                     i_resource = createMO_OnlineResource(doc_link[0]['href'])
-                project = createCEDA_Project(abstract=i_abstract, publication_state=MO_PublicationStateValue.cl_working, \
+                project = createCEDA_Project(abstract=i_abstract, publication_state=CEDA_PublicationStateValue.cl_working, \
                                              documentation=i_documentation, project_resource=i_resource)
                 self._commitDeploymentMigration(project, activity, 'ceda_project_id')