camel: Integrate Phase1 into the Phase3 files.

Not all basic types were checked if they are compatible between
Phase3 and Phase1. This needs to be done at some point in time.

4 files changed, 159 insertions, 0 deletions

diff --git a/camel/phase3/CAP-datatypes.asn b/camel/phase3/CAP-datatypes.asn
index 4f65232..c334142 100644
--- a/camel/phase3/CAP-datatypes.asn
+++ b/camel/phase3/CAP-datatypes.asn
@@ -151,6 +151,12 @@ BasicGapCriteria {PARAMETERS-BOUND : bound} 					::= CHOICE {
 -- For the handling of numbers starting with the same digit string refer to the detailed 
 -- procedure of the CallGap operation
 
+BCSMEventV1							::= SEQUENCE {
+	eventTypeBCSM					[0] EventTypeBCSM,
+	monitorMode						[1] MonitorMode,
+	legID							[2] LegID							OPTIONAL
+	}
+
 BCSMEvent  ::= SEQUENCE {
 	eventTypeBCSM		[0] EventTypeBCSM,
 	monitorMode			[1] MonitorMode,
diff --git a/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn b/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn
index af40cba..aa9da82 100644
--- a/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn
+++ b/camel/phase3/CAP-gsmSSF-gsmSCF-ops-args.asn
@@ -145,6 +145,10 @@ FROM CAP-errortypes errortypes
 
 ;
 
+activityTestV1 OPERATION ::= {
+	RETURN RESULT	TRUE
+	CODE			opcode-activityTest}
+
 activityTestV3 OPERATION ::= {
 	RETURN RESULT TRUE
 	CODE	opcode-activityTest
@@ -314,6 +318,19 @@ CancelArgV3 ::= CHOICE {
 	}
 -- The InvokeID has the same value as that which was used for the operation to be cancelled.
 
+connectV1 OPERATION ::= {
+	ARGUMENT		ConnectArgV1
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter}
+	CODE			opcode-connect
+}
+
 connectV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ConnectArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -330,6 +347,19 @@ connectV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to request the gsmSSF to perform the call processing actions
 -- to route or forward a call to a specified destination.
 
+ConnectArgV1 ::= SEQUENCE {
+	destinationRoutingAddress	[0] DestinationRoutingAddress,
+	originalCalledPartyID		[6] OriginalCalledPartyID		OPTIONAL,
+	extensions					[10] SEQUENCE SIZE(1..numOfExtensionsV1) OF ExtensionField																		OPTIONAL,
+	genericNumbers				[14] GenericNumbers				OPTIONAL,
+	callingPartysCategory		[28] CallingPartysCategory		OPTIONAL,
+	redirectingPartyID			[29] RedirectingPartyID			OPTIONAL,
+	redirectionInformation		[30] RedirectionInformation		OPTIONAL,
+	suppressionOfAnnouncement	[55] SuppressionOfAnnouncement	OPTIONAL,
+	oCSIApplicable				[56] OCSIApplicable				OPTIONAL,
+	...
+}
+
 ConnectArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	destinationRoutingAddress		[0] DestinationRoutingAddress {bound},
 	alertingPattern	[1] AlertingPattern	OPTIONAL,
@@ -377,6 +407,12 @@ ConnectToResourceArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+continueV1 OPERATION ::= {
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-continue
+}
+
 continueV3 OPERATION ::= {
 	RETURN RESULT	FALSE
 	ALWAYS RESPONDS	FALSE
@@ -461,6 +497,13 @@ EstablishTemporaryConnectionArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	...
 	}
 
+eventReportBCSMV1 OPERATION ::= {
+	ARGUMENT		EventReportBCSMArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-eventReportBCSM
+}
+
 eventReportBCSMV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		EventReportBCSMArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -472,6 +515,15 @@ eventReportBCSMV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- events such as busy or no answer) previously requested by the gsmSCF in a
 -- RequestReportBCSMEvent operation.
 
+EventReportBCSMArgV1					::= SEQUENCE {
+	eventTypeBCSM					[0] EventTypeBCSM,
+	eventSpecificInformationBCSM	[2] EventSpecificInformationBCSM	OPTIONAL,
+	legID							[3] LegID							OPTIONAL,
+	miscCallInfo					[4] MiscCallInfo			DEFAULT {messageType request},
+	extensions						[5] SEQUENCE SIZE(1..numOfExtensionsV1) OF ExtensionField																				OPTIONAL,
+	...
+	}
+
 EventReportBCSMArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	eventTypeBCSM					[0] EventTypeBCSM,
 	eventSpecificInformationBCSM	[2] EventSpecificInformationBCSM {bound}			OPTIONAL,
@@ -498,6 +550,20 @@ furnishChargingInformationV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 
 FurnishChargingInformationArgV3 {PARAMETERS-BOUND : bound} ::= FCIBillingChargingCharacteristics{bound}
 
+initialDPV1 OPERATION ::= {
+	ARGUMENT		InitialDPArgV1
+	RETURN RESULT	FALSE
+	ERRORS {
+		missingCustomerRecord |
+		missingParameter |
+		systemFailure |
+		taskRefused |
+		unexpectedComponentSequence |
+		unexpectedDataValue |
+		unexpectedParameter
+		}
+	CODE			opcode-initialDP}
+
 initialDPV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		InitialDPArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -514,6 +580,30 @@ initialDPV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- Direction: gsmSSF -> gsmSCF, Timer: Tidp 
 -- This operation is used after a TDP to indicate request for service.
 
+InitialDPArgV1						::= SEQUENCE {
+	serviceKey						[0] ServiceKey,
+	calledPartyNumber				[2] CalledPartyNumber				OPTIONAL,
+	callingPartyNumber				[3] CallingPartyNumber				OPTIONAL,
+	callingPartysCategory			[5] CallingPartysCategory			OPTIONAL,
+	locationNumber					[10] LocationNumber					OPTIONAL,
+	originalCalledPartyID			[12] OriginalCalledPartyID			OPTIONAL,
+	extensions						[15] SEQUENCE SIZE(1..numOfExtensionsV1) OF ExtensionField																			OPTIONAL,
+	highLayerCompatibility			[23] HighLayerCompatibility			OPTIONAL,
+	additionalCallingPartyNumber	[25] AdditionalCallingPartyNumber	OPTIONAL,
+	bearerCapability				[27] BearerCapability				OPTIONAL,
+	eventTypeBCSM					[28] EventTypeBCSM					OPTIONAL,
+	redirectingPartyID				[29] RedirectingPartyID				OPTIONAL,
+	redirectionInformation			[30] RedirectionInformation			OPTIONAL,
+	iMSI							[50] IMSI							OPTIONAL,
+	subscriberState					[51] SubscriberState				OPTIONAL,
+	locationInformation				[52] LocationInformation			OPTIONAL,
+	ext-basicServiceCode			[53] Ext-BasicServiceCode			OPTIONAL,
+	callReferenceNumber				[54] CallReferenceNumber			OPTIONAL,
+	mscAddress						[55] ISDN-AddressString				OPTIONAL,
+	calledPartyBCDNumber			[56] CalledPartyBCDNumber			OPTIONAL,
+...
+	}
+
 InitialDPArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	serviceKey							[0] ServiceKey	,
 	calledPartyNumber					[2] CalledPartyNumber {bound}					OPTIONAL,
@@ -560,6 +650,13 @@ InitialDPArgExtension				::= SEQUENCE {
 -- detailed in the IPSSPCapabilities parameter itself.
 -- Carrier is included at the discretion of the gsmSSF operator.
 
+releaseCallV1 OPERATION ::= {
+	ARGUMENT	ReleaseCallArgV1
+	RETURN RESULT	FALSE
+	ALWAYS RESPONDS	FALSE
+	CODE			opcode-releaseCall
+}
+
 releaseCallV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		ReleaseCallArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -570,9 +667,22 @@ releaseCallV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 -- This operation is used to tear down an existing call at any phase of the call for all parties 
 -- involved in the call. 
 
+ReleaseCallArgV1 ::= Cause
 ReleaseCallArgV3 {PARAMETERS-BOUND : bound} ::= Cause {bound} 
 -- A default value of decimal 31 (normal unspecified) shall be given.
 
+requestReportBCSMEventV1 OPERATION ::= {
+	ARGUMENT		RequestReportBCSMEventArgV1
+	RETURN RESULT	FALSE
+	ERRORS			{missingParameter |
+					systemFailure |
+					taskRefused |
+					unexpectedComponentSequence |
+					unexpectedDataValue |
+					unexpectedParameter}
+	CODE			opcode-requestReportBCSMEvent
+}
+
 requestReportBCSMEventV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 	ARGUMENT		RequestReportBCSMEventArgV3 {bound}
 	RETURN RESULT	FALSE
@@ -595,6 +705,15 @@ requestReportBCSMEventV3 {PARAMETERS-BOUND : bound} OPERATION ::= {
 --		No implicit arming of EDPs at the gsmSSF after reception of any operation (different 
 --		from RequestReportBCSMEvent) from the gsmSCF is allowed.
 
+numOfBCSMEventsV1				INTEGER ::= 10
+numOfExtensionsV1				INTEGER ::= 10
+
+RequestReportBCSMEventArgV1 ::= SEQUENCE  {
+	bcsmEvents						[0] SEQUENCE SIZE (1..numOfBCSMEventsV1) OF BCSMEventV1,
+	extensions						[2] SEQUENCE SIZE (1..numOfExtensionsV1) OF ExtensionField																			OPTIONAL,
+	...
+	}
+
 RequestReportBCSMEventArgV3 {PARAMETERS-BOUND : bound} ::= SEQUENCE {
 	bcsmEvents	[0] SEQUENCE SIZE(1..bound.&numOfBCSMEvents) OF BCSMEvent,
 	extensions	[2] Extensions {bound} 	OPTIONAL,
diff --git a/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn b/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
index 7ec1c5a..7286ae3 100644
--- a/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
+++ b/camel/phase3/CAP-gsmSSF-gsmSCF-pkgs-contracts-acs.asn
@@ -29,6 +29,7 @@ FROM TCAPMessages tc-Messages
 	dialogue-abstract-syntax
 FROM TC-Notation-Extensions tc-NotationExtensions
 
+	activityTestV1,
 	activityTestV3,
 	applyChargingV3 {},
 	applyChargingReportV3 {},
@@ -37,16 +38,22 @@ FROM TC-Notation-Extensions tc-NotationExtensions
 	callInformationReportV3 {},
 	callInformationRequestV3 {},
 	cancelV3 ,
+	connectV1,
 	connectV3 {},
 	connectToResourceV3 {},
+	continueV1,
 	continueV3,
 	continueWithArgumentV3 {},
 	disconnectForwardConnectionV3,
 	establishTemporaryConnectionV3 {},
+	eventReportBCSMV1,
 	eventReportBCSMV3 {},
 	furnishChargingInformationV3 {},
+	initialDPV1,
 	initialDPV3 {},
+	releaseCallV1,
 	releaseCallV3 {},
+	requestReportBCSMEventV1,
 	requestReportBCSMEventV3 {},
 	resetTimerV3 {},
 	sendChargingInformationV3 {}
@@ -97,6 +104,13 @@ umts-network(1) modules(3) cap-object-identifiers(100) version3(2)}
 
 -- Application Contexts
 
+capssf-scfGenericACV1 APPLICATION-CONTEXT ::= {
+	CONTRACT					capSsfToScfGenericV1
+	DIALOGUE MODE				structured
+	ABSTRACT SYNTAXES			{dialogue-abstract-syntax |
+								gsmSSF-scfGenericAbstractSyntaxV3} 
+	APPLICATION CONTEXT NAME	id-ac-CAP-gsmSSF-scfGenericACV1}
+
 capssf-scfGenericACV3 APPLICATION-CONTEXT ::= {
 	CONTRACT					capSsfToScfGenericV3
 	DIALOGUE MODE				structured
@@ -113,6 +127,11 @@ capssf-scfAssistHandoffACV3 APPLICATION-CONTEXT ::= 	{
 
 
 -- Contracts
+capSsfToScfGenericV1 CONTRACT ::= {
+	INITIATOR CONSUMER OF		{scfActivationPackageV1}
+	RESPONDER CONSUMER OF		{activityTestPackageV1 | connectPackageV1 | callHandlingPackageV1  |
+					bcsmEventHandlingPackageV1 | ssfCallProcessingPackageV1}
+}
 
 capSsfToScfGenericV3 CONTRACT ::= {
 -- dialogue initiated by gsmSSF with InitialDP Operation
@@ -154,6 +173,8 @@ capAssistHandoffssfToScfV3 CONTRACT ::= {
 
 
 -- Operation Packages
+scfActivationPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{initialDPV1}}
 
 scfActivationPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{initialDPV3 {bound}}
@@ -170,16 +191,25 @@ genericDisconnectResourcePackageV3  OPERATION-PACKAGE ::= {
 nonAssistedConnectionEstablishmentPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectToResourceV3 {bound}}
 	ID		id-package-nonAssistedConnectionEstablishmentV3}
+connectPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{connectV1}}
 connectPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{connectV3 {bound}}
 	ID		id-package-connectV3}
+callHandlingPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{releaseCallV1}}
 callHandlingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{releaseCallV3 {bound}}
 	ID		id-package-callHandlingV3}
+bcsmEventHandlingPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{eventReportBCSMV1}
+	SUPPLIER INVOKES	{requestReportBCSMEventV1}}
 bcsmEventHandlingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{requestReportBCSMEventV3 {bound}}
 	SUPPLIER INVOKES	{eventReportBCSMV3 {bound}}
 	ID		id-package-bcsmEventHandlingV3}
+ssfCallProcessingPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{continueV1}}
 ssfCallProcessingPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{continueWithArgumentV3 {bound} | continueV3}
 	ID		id-package-ssfCallProcessingV3}
@@ -203,6 +233,8 @@ callReportPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 signallingControlPackageV3 {PARAMETERS-BOUND : bound} OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{sendChargingInformationV3 {bound}}
 	ID		id-package-signallingControlV3}
+activityTestPackageV1 OPERATION-PACKAGE ::= {
+	CONSUMER INVOKES	{activityTestV1}}
 activityTestPackageV3 OPERATION-PACKAGE ::= {
 	CONSUMER INVOKES	{activityTestV3}
 	ID		id-package-activityTestV3}
diff --git a/camel/phase3/CAP-object-identifiers.asn b/camel/phase3/CAP-object-identifiers.asn
index 886c4c8..a531734 100644
--- a/camel/phase3/CAP-object-identifiers.asn
+++ b/camel/phase3/CAP-object-identifiers.asn
@@ -72,6 +72,7 @@ gprsSSF-gsmSCF-Protocol 		OBJECT IDENTIFIER ::=
 	{ccitt(0) identified-organization(4) etsi(0) mobileDomain(0) umts-network(1) modules(3)
 	cap-gprsSSF-gsmSCF-pkgs-contracts-acs(108) version3(2)}
 
+id-GSM-ac OBJECT IDENTIFIER ::= {ccitt(0) identified-organization(4) etsi(0) mobileDomain(0) gsm-Network(1) ac(0)}
 
 id-CAPV3							OBJECT IDENTIFIER ::= 
 	{ccitt(0) identified-organization(4) etsi(0) mobileDomain(0)
@@ -98,6 +99,7 @@ id-rosObject-gsmSSFV3							OBJECT IDENTIFIER ::= {id-rosObjectV3 5}
 id-rosObject-gsmSRFV3							OBJECT IDENTIFIER ::= {id-rosObjectV3 6}
 
 -- gsmSSF/gsmSCF AC
+id-ac-CAP-gsmSSF-scfGenericACV1					OBJECT IDENTIFIER ::= {id-GSM-ac cap-gsmssf-to-gsmscf(50) version1(0)}
 id-ac-CAP-gsmSSF-scfGenericACV3				OBJECT IDENTIFIER ::= {id-acEV3 4}
 id-ac-CAP-gsmSSF-scfAssistHandoffACV3			OBJECT IDENTIFIER ::= {id-acEV3 6}