rdkcentral · Nandana-NNR · Dec 19, 2024 · Dec 24, 2024
diff --git a/cypress/TestCases/README.md b/cypress/TestCases/README.md
@@ -28,6 +28,6 @@ Here are some examples of tags for different categories:
 * Tags for communicationModes: @sdk, @transport
 
 ## Directory strucute:
-Within the `cypress/TestCases` folder we have the following sub-folders:
+Within the `cypress/TestCases/<sdkVersion>` folder we have the following sub-folders:
 - FireboltCertification: Contains core and manage feature files.
 - Sanity: Contains core and manage sanity tests.
diff --git a/...reboltCertification/Accessibility.feature → ...reboltCertification/Accessibility.feature b/...reboltCertification/Accessibility.feature → ...reboltCertification/Accessibility.feature
diff --git a/...ses/FireboltCertification/Account.feature → ...est/FireboltCertification/Account.feature b/...ses/FireboltCertification/Account.feature → ...est/FireboltCertification/Account.feature
diff --git a/...nalTestcases/ClosedCaptionsManage.feature → ...nalTestcases/ClosedCaptionsManage.feature b/...nalTestcases/ClosedCaptionsManage.feature → ...nalTestcases/ClosedCaptionsManage.feature
diff --git a/...on/AdditionalTestcases/UserGrants.feature → ...on/AdditionalTestcases/UserGrants.feature b/...on/AdditionalTestcases/UserGrants.feature → ...on/AdditionalTestcases/UserGrants.feature
diff --git a/...FireboltCertification/Advertising.feature → ...FireboltCertification/Advertising.feature b/...FireboltCertification/Advertising.feature → ...FireboltCertification/Advertising.feature
diff --git a/...eboltCertification/Authentication.feature → ...eboltCertification/Authentication.feature b/...eboltCertification/Authentication.feature → ...eboltCertification/Authentication.feature
diff --git a/...ireboltCertification/Capabilities.feature → ...ireboltCertification/Capabilities.feature b/...ireboltCertification/Capabilities.feature → ...ireboltCertification/Capabilities.feature
diff --git a/...ases/FireboltCertification/Device.feature → ...test/FireboltCertification/Device.feature b/...ases/FireboltCertification/Device.feature → ...test/FireboltCertification/Device.feature
diff --git a/...s/FireboltCertification/Discovery.feature → ...t/FireboltCertification/Discovery.feature b/...s/FireboltCertification/Discovery.feature → ...t/FireboltCertification/Discovery.feature
diff --git a/...Certification/DiscoveryLaunchCold.feature → ...Certification/DiscoveryLaunchCold.feature b/...Certification/DiscoveryLaunchCold.feature → ...Certification/DiscoveryLaunchCold.feature
diff --git a/...tCertification/DiscoveryLaunchHot.feature → ...tCertification/DiscoveryLaunchHot.feature b/...tCertification/DiscoveryLaunchHot.feature → ...tCertification/DiscoveryLaunchHot.feature
diff --git a/...es/FireboltCertification/Keyboard.feature → ...st/FireboltCertification/Keyboard.feature b/...es/FireboltCertification/Keyboard.feature → ...st/FireboltCertification/Keyboard.feature
diff --git a/...tion/LifecycleTestcases/Lifecycle.feature → ...tion/LifecycleTestcases/Lifecycle.feature b/...tion/LifecycleTestcases/Lifecycle.feature → ...tion/LifecycleTestcases/Lifecycle.feature
diff --git a/...ification/LifecycleTestcases/Lifecycle.md → ...ification/LifecycleTestcases/Lifecycle.md b/...ification/LifecycleTestcases/Lifecycle.md → ...ification/LifecycleTestcases/Lifecycle.md
diff --git a/...ycleTestcases/LifecycleBackground.feature → ...ycleTestcases/LifecycleBackground.feature b/...ycleTestcases/LifecycleBackground.feature → ...ycleTestcases/LifecycleBackground.feature
diff --git a/...Testcases/LifecycleConfigurations.feature → ...Testcases/LifecycleConfigurations.feature b/...Testcases/LifecycleConfigurations.feature → ...Testcases/LifecycleConfigurations.feature
diff --git a/...ycleTestcases/LifecycleForeground.feature → ...ycleTestcases/LifecycleForeground.feature b/...ycleTestcases/LifecycleForeground.feature → ...ycleTestcases/LifecycleForeground.feature
diff --git a/...ecycleTestcases/LifecycleInactive.feature → ...ecycleTestcases/LifecycleInactive.feature b/...ecycleTestcases/LifecycleInactive.feature → ...ecycleTestcases/LifecycleInactive.feature
diff --git a/...leTestcases/LifecycleInitializing.feature → ...leTestcases/LifecycleInitializing.feature b/...leTestcases/LifecycleInitializing.feature → ...leTestcases/LifecycleInitializing.feature
diff --git a/...cycleTestcases/LifecycleSuspended.feature → ...cycleTestcases/LifecycleSuspended.feature b/...cycleTestcases/LifecycleSuspended.feature → ...cycleTestcases/LifecycleSuspended.feature
diff --git a/...ycleTestcases/LifecycleTerminated.feature → ...ycleTestcases/LifecycleTerminated.feature b/...ycleTestcases/LifecycleTerminated.feature → ...ycleTestcases/LifecycleTerminated.feature
diff --git a/...cycleTestcases/LifecycleUnloading.feature → ...cycleTestcases/LifecycleUnloading.feature b/...cycleTestcases/LifecycleUnloading.feature → ...cycleTestcases/LifecycleUnloading.feature
diff --git a/...ireboltCertification/Localization.feature → ...ireboltCertification/Localization.feature b/...ireboltCertification/Localization.feature → ...ireboltCertification/Localization.feature
diff --git a/...ertification/Manage/AccountManage.feature → ...ertification/Manage/AccountManage.feature b/...ertification/Manage/AccountManage.feature → ...ertification/Manage/AccountManage.feature
diff --git a/...cknowledgeChallengeManage_RpcOnly.feature → ...cknowledgeChallengeManage_RpcOnly.feature b/...cknowledgeChallengeManage_RpcOnly.feature → ...cknowledgeChallengeManage_RpcOnly.feature
diff --git a/...fication/Manage/AdvertisingManage.feature → ...fication/Manage/AdvertisingManage.feature b/...fication/Manage/AdvertisingManage.feature → ...fication/Manage/AdvertisingManage.feature
diff --git a/...on/Manage/AudioDescriptionsManage.feature → ...on/Manage/AudioDescriptionsManage.feature b/...on/Manage/AudioDescriptionsManage.feature → ...on/Manage/AudioDescriptionsManage.feature
diff --git a/...ation/Manage/ClosedCaptionsManage.feature → ...ation/Manage/ClosedCaptionsManage.feature b/...ation/Manage/ClosedCaptionsManage.feature → ...ation/Manage/ClosedCaptionsManage.feature
diff --git a/...Certification/Manage/DeviceManage.feature → ...Certification/Manage/DeviceManage.feature b/...Certification/Manage/DeviceManage.feature → ...Certification/Manage/DeviceManage.feature
diff --git a/...tification/Manage/DiscoveryManage.feature → ...tification/Manage/DiscoveryManage.feature b/...tification/Manage/DiscoveryManage.feature → ...tification/Manage/DiscoveryManage.feature
diff --git a/...oltCertification/Manage/HdmiInput.feature → ...oltCertification/Manage/HdmiInput.feature b/...oltCertification/Manage/HdmiInput.feature → ...oltCertification/Manage/HdmiInput.feature
diff --git a/...ion/Manage/KeyboardManage_RpcOnly.feature → ...ion/Manage/KeyboardManage_RpcOnly.feature b/...ion/Manage/KeyboardManage_RpcOnly.feature → ...ion/Manage/KeyboardManage_RpcOnly.feature
diff --git a/...ication/Manage/LocalizationManage.feature → ...ication/Manage/LocalizationManage.feature b/...ication/Manage/LocalizationManage.feature → ...ication/Manage/LocalizationManage.feature
diff --git a/...ertification/Manage/MetricsManage.feature → ...ertification/Manage/MetricsManage.feature b/...ertification/Manage/MetricsManage.feature → ...ertification/Manage/MetricsManage.feature
diff --git a/...ertification/Manage/PrivacyManage.feature → ...ertification/Manage/PrivacyManage.feature b/...ertification/Manage/PrivacyManage.feature → ...ertification/Manage/PrivacyManage.feature
diff --git a/...tion/Manage/ProfileManage_RpcOnly.feature → ...tion/Manage/ProfileManage_RpcOnly.feature b/...tion/Manage/ProfileManage_RpcOnly.feature → ...tion/Manage/ProfileManage_RpcOnly.feature
diff --git a/...cation/Manage/SecureStorageManage.feature → ...cation/Manage/SecureStorageManage.feature b/...cation/Manage/SecureStorageManage.feature → ...cation/Manage/SecureStorageManage.feature
diff --git a/...ification/Manage/UserGrantsManage.feature → ...ification/Manage/UserGrantsManage.feature b/...ification/Manage/UserGrantsManage.feature → ...ification/Manage/UserGrantsManage.feature
diff --git a/...cation/Manage/VoiceGuidanceManage.feature → ...cation/Manage/VoiceGuidanceManage.feature b/...cation/Manage/VoiceGuidanceManage.feature → ...cation/Manage/VoiceGuidanceManage.feature
diff --git a/...ltCertification/Manage/WifiManage.feature → ...ltCertification/Manage/WifiManage.feature b/...ltCertification/Manage/WifiManage.feature → ...ltCertification/Manage/WifiManage.feature
diff --git a/...ses/FireboltCertification/Metrics.feature → ...est/FireboltCertification/Metrics.feature b/...ses/FireboltCertification/Metrics.feature → ...est/FireboltCertification/Metrics.feature
diff --git a/...boltCertification/Metrics_RpcOnly.feature → ...boltCertification/Metrics_RpcOnly.feature b/...boltCertification/Metrics_RpcOnly.feature → ...boltCertification/Metrics_RpcOnly.feature
diff --git a/.../FireboltCertification/Parameters.feature → .../FireboltCertification/Parameters.feature b/.../FireboltCertification/Parameters.feature → .../FireboltCertification/Parameters.feature
diff --git a/...ion/PreRequisite/SetDefaultValues.feature → ...ion/PreRequisite/SetDefaultValues.feature b/...ion/PreRequisite/SetDefaultValues.feature → ...ion/PreRequisite/SetDefaultValues.feature
diff --git a/...fication/PreRequisite/SetDefaultValues.md → ...fication/PreRequisite/SetDefaultValues.md b/...fication/PreRequisite/SetDefaultValues.md → ...fication/PreRequisite/SetDefaultValues.md
diff --git a/...ification/PreRequisite/SetupCheck.feature → ...ification/PreRequisite/SetupCheck.feature b/...ification/PreRequisite/SetupCheck.feature → ...ification/PreRequisite/SetupCheck.feature
diff --git a/...ses/FireboltCertification/Profile.feature → ...est/FireboltCertification/Profile.feature b/...ses/FireboltCertification/Profile.feature → ...est/FireboltCertification/Profile.feature
diff --git a/...cation/SDKBehavior/AdvertisingSDK.feature → ...cation/SDKBehavior/AdvertisingSDK.feature b/...cation/SDKBehavior/AdvertisingSDK.feature → ...cation/SDKBehavior/AdvertisingSDK.feature
diff --git a/...ion/SDKBehavior/ClosedCaptionsSDK.feature → ...ion/SDKBehavior/ClosedCaptionsSDK.feature b/...ion/SDKBehavior/ClosedCaptionsSDK.feature → ...ion/SDKBehavior/ClosedCaptionsSDK.feature
diff --git a/...rtification/SDKBehavior/DeviceSDK.feature → ...rtification/SDKBehavior/DeviceSDK.feature b/...rtification/SDKBehavior/DeviceSDK.feature → ...rtification/SDKBehavior/DeviceSDK.feature
diff --git a/...ation/SDKBehavior/LocalizationSDK.feature → ...ation/SDKBehavior/LocalizationSDK.feature b/...ation/SDKBehavior/LocalizationSDK.feature → ...ation/SDKBehavior/LocalizationSDK.feature
diff --git a/...tification/SDKBehavior/PrivacySDK.feature → ...tification/SDKBehavior/PrivacySDK.feature b/...tification/SDKBehavior/PrivacySDK.feature → ...tification/SDKBehavior/PrivacySDK.feature
diff --git a/...tion/SDKBehavior/VoiceGuidanceSDK.feature → ...tion/SDKBehavior/VoiceGuidanceSDK.feature b/...tion/SDKBehavior/VoiceGuidanceSDK.feature → ...tion/SDKBehavior/VoiceGuidanceSDK.feature
diff --git a/...ireboltCertification/SecondScreen.feature → ...ireboltCertification/SecondScreen.feature b/...ireboltCertification/SecondScreen.feature → ...ireboltCertification/SecondScreen.feature
diff --git a/...reboltCertification/SecureStorage.feature → ...reboltCertification/SecureStorage.feature b/...reboltCertification/SecureStorage.feature → ...reboltCertification/SecureStorage.feature
diff --git a/.../FireboltCertification/UserGrants.feature → .../FireboltCertification/UserGrants.feature b/.../FireboltCertification/UserGrants.feature → .../FireboltCertification/UserGrants.feature
diff --git a/...Cases/FireboltCertification/UserGrants.md → ...atest/FireboltCertification/UserGrants.md b/...Cases/FireboltCertification/UserGrants.md → ...atest/FireboltCertification/UserGrants.md
diff --git a/...ireboltCertification/UserInterest.feature → ...ireboltCertification/UserInterest.feature b/...ireboltCertification/UserInterest.feature → ...ireboltCertification/UserInterest.feature
diff --git a/cypress/TestCases/Sample/Hello.feature → ...ess/TestCases/latest/Sample/Hello.feature b/cypress/TestCases/Sample/Hello.feature → ...ess/TestCases/latest/Sample/Hello.feature
diff --git a/cypress/TestCases/Sample/Sample.feature → ...ss/TestCases/latest/Sample/Sample.feature b/cypress/TestCases/Sample/Sample.feature → ...ss/TestCases/latest/Sample/Sample.feature
diff --git a/...ess/TestCases/Sanity/CoreSDKSuite.feature → ...tCases/latest/Sanity/CoreSDKSuite.feature b/...ess/TestCases/Sanity/CoreSDKSuite.feature → ...tCases/latest/Sanity/CoreSDKSuite.feature
diff --git a/...estCases/Sanity/DiscoverySDKSuite.feature → ...s/latest/Sanity/DiscoverySDKSuite.feature b/...estCases/Sanity/DiscoverySDKSuite.feature → ...s/latest/Sanity/DiscoverySDKSuite.feature
diff --git a/...s/TestCases/Sanity/ManageSDKSuite.feature → ...ases/latest/Sanity/ManageSDKSuite.feature b/...s/TestCases/Sanity/ManageSDKSuite.feature → ...ases/latest/Sanity/ManageSDKSuite.feature
diff --git a/cypress/fixtures/docs/validations.md b/cypress/fixtures/docs/validations.md
@@ -519,7 +519,7 @@ The basic structure of the validation object in configModule with override will
 }
 ```
 
-While validating, if a key is present in both fcs-validation jsons (eg: cypress/fixtures/objects/validationObjects/accessibility.json ) and also in configModule's validation jsons (eg: in config module : fixtures/objects/validationObjects/account.json ) which will be in cypress/fixtures/external/objects/validationObjects/, it will be checking for the "override" value first. If the override value of config validation object is matching with fcs validation objects data's index value, then that specific object in the data array will be overriden with the object from configModule. Else, the configModule object will be pushed as a new object in the data array.
+While validating, if a key is present in both fcs-validation jsons (eg: cypress/fixtures/objects/validationObjects/accessibility.json ) and also in configModule's validation jsons (eg: in config module : fixtures/objects/validationObjects/account.json ) which will be in cypress/fixtures/external/<sdkVersion>objects/validationObjects/, it will be checking for the "override" value first. If the override value of config validation object is matching with fcs validation objects data's index value, then that specific object in the data array will be overriden with the object from configModule. Else, the configModule object will be pushed as a new object in the data array.
 
 ### Example:
 

diff --git a/cypress/fixtures/PreRequisiteData.json → ...ess/fixtures/latest/PreRequisiteData.json b/cypress/fixtures/PreRequisiteData.json → ...ess/fixtures/latest/PreRequisiteData.json
diff --git a/cypress/fixtures/apiObjectContext.json → ...ess/fixtures/latest/apiObjectContext.json b/cypress/fixtures/apiObjectContext.json → ...ess/fixtures/latest/apiObjectContext.json
diff --git a/cypress/fixtures/censorData.json → cypress/fixtures/latest/censorData.json b/cypress/fixtures/censorData.json → cypress/fixtures/latest/censorData.json
diff --git a/cypress/fixtures/customReportData.json → ...ess/fixtures/latest/customReportData.json b/cypress/fixtures/customReportData.json → ...ess/fixtures/latest/customReportData.json
diff --git a/cypress/fixtures/customReportData.md → cypress/fixtures/latest/customReportData.md b/cypress/fixtures/customReportData.md → cypress/fixtures/latest/customReportData.md
@@ -2,7 +2,7 @@
 We use a JSON structure to define `customFooter` and `customMetadata` for various pages within the report. This allows dynamic customization, ensuring that each page can have specific information and design elements as needed.
 
 ## Loading the JSON Data
-The JSON data will first be loaded from `configModule/fixtures/external/objects/customReportData.json`. If this file is not available in the configModule, the data will be loaded from the local JSON file located at `cypress/fixtures/customReportData.json`.
+The JSON data will first be loaded from `configModule/fixtures/external/<sdkVersion>/objects/customReportData.json`. If this file is not available in the configModule, the data will be loaded from the local JSON file located at `cypress/fixtures/customReportData.json`.
 
 ## Fields
 `customFooter`

diff --git a/cypress/fixtures/decodeValue.json → cypress/fixtures/latest/decodeValue.json b/cypress/fixtures/decodeValue.json → cypress/fixtures/latest/decodeValue.json
diff --git a/cypress/fixtures/defaultDeviceData.json → ...ss/fixtures/latest/defaultDeviceData.json b/cypress/fixtures/defaultDeviceData.json → ...ss/fixtures/latest/defaultDeviceData.json
diff --git a/cypress/fixtures/defaultTestData.json → cypress/fixtures/latest/defaultTestData.json b/cypress/fixtures/defaultTestData.json → cypress/fixtures/latest/defaultTestData.json
diff --git a/...s/fixtures/fireboltCalls/accessibility.js → ...res/latest/fireboltCalls/accessibility.js b/...s/fixtures/fireboltCalls/accessibility.js → ...res/latest/fireboltCalls/accessibility.js
diff --git a/...fixtures/fireboltCalls/accessibility.json → ...s/latest/fireboltCalls/accessibility.json b/...fixtures/fireboltCalls/accessibility.json → ...s/latest/fireboltCalls/accessibility.json
diff --git a/cypress/fixtures/fireboltCalls/account.js → .../fixtures/latest/fireboltCalls/account.js b/cypress/fixtures/fireboltCalls/account.js → .../fixtures/latest/fireboltCalls/account.js
diff --git a/cypress/fixtures/fireboltCalls/account.json → ...ixtures/latest/fireboltCalls/account.json b/cypress/fixtures/fireboltCalls/account.json → ...ixtures/latest/fireboltCalls/account.json
diff --git a/...ess/fixtures/fireboltCalls/advertising.js → ...tures/latest/fireboltCalls/advertising.js b/...ess/fixtures/fireboltCalls/advertising.js → ...tures/latest/fireboltCalls/advertising.js
diff --git a/...s/fixtures/fireboltCalls/advertising.json → ...res/latest/fireboltCalls/advertising.json b/...s/fixtures/fireboltCalls/advertising.json → ...res/latest/fireboltCalls/advertising.json
diff --git a/...xtures/fireboltCalls/audiodescriptions.js → ...latest/fireboltCalls/audiodescriptions.js b/...xtures/fireboltCalls/audiodescriptions.js → ...latest/fireboltCalls/audiodescriptions.js
diff --git a/...ures/fireboltCalls/audiodescriptions.json → ...test/fireboltCalls/audiodescriptions.json b/...ures/fireboltCalls/audiodescriptions.json → ...test/fireboltCalls/audiodescriptions.json
diff --git a/.../fixtures/fireboltCalls/authentication.js → ...es/latest/fireboltCalls/authentication.js b/.../fixtures/fireboltCalls/authentication.js → ...es/latest/fireboltCalls/authentication.js
diff --git a/...ixtures/fireboltCalls/authentication.json → .../latest/fireboltCalls/authentication.json b/...ixtures/fireboltCalls/authentication.json → .../latest/fireboltCalls/authentication.json
diff --git a/...ss/fixtures/fireboltCalls/capabilities.js → ...ures/latest/fireboltCalls/capabilities.js b/...ss/fixtures/fireboltCalls/capabilities.js → ...ures/latest/fireboltCalls/capabilities.js
diff --git a/.../fixtures/fireboltCalls/capabilities.json → ...es/latest/fireboltCalls/capabilities.json b/.../fixtures/fireboltCalls/capabilities.json → ...es/latest/fireboltCalls/capabilities.json
diff --git a/.../fixtures/fireboltCalls/closedcaptions.js → ...es/latest/fireboltCalls/closedcaptions.js b/.../fixtures/fireboltCalls/closedcaptions.js → ...es/latest/fireboltCalls/closedcaptions.js
diff --git a/...ixtures/fireboltCalls/closedcaptions.json → .../latest/fireboltCalls/closedcaptions.json b/...ixtures/fireboltCalls/closedcaptions.json → .../latest/fireboltCalls/closedcaptions.json
diff --git a/cypress/fixtures/fireboltCalls/content.json → ...ixtures/latest/fireboltCalls/content.json b/cypress/fixtures/fireboltCalls/content.json → ...ixtures/latest/fireboltCalls/content.json
diff --git a/cypress/fixtures/fireboltCalls/device.js → ...s/fixtures/latest/fireboltCalls/device.js b/cypress/fixtures/fireboltCalls/device.js → ...s/fixtures/latest/fireboltCalls/device.js
diff --git a/cypress/fixtures/fireboltCalls/device.json → ...fixtures/latest/fireboltCalls/device.json b/cypress/fixtures/fireboltCalls/device.json → ...fixtures/latest/fireboltCalls/device.json
diff --git a/cypress/fixtures/fireboltCalls/discovery.js → ...ixtures/latest/fireboltCalls/discovery.js b/cypress/fixtures/fireboltCalls/discovery.js → ...ixtures/latest/fireboltCalls/discovery.js
diff --git a/...ess/fixtures/fireboltCalls/discovery.json → ...tures/latest/fireboltCalls/discovery.json b/...ess/fixtures/fireboltCalls/discovery.json → ...tures/latest/fireboltCalls/discovery.json
diff --git a/...xtures/fireboltCalls/discoverylaunch.json → ...latest/fireboltCalls/discoverylaunch.json b/...xtures/fireboltCalls/discoverylaunch.json → ...latest/fireboltCalls/discoverylaunch.json
diff --git a/...ixtures/fireboltCalls/dynamicVariables.js → .../latest/fireboltCalls/dynamicVariables.js b/...ixtures/fireboltCalls/dynamicVariables.js → .../latest/fireboltCalls/dynamicVariables.js
diff --git a/cypress/fixtures/fireboltCalls/hdmiinput.js → ...ixtures/latest/fireboltCalls/hdmiinput.js b/cypress/fixtures/fireboltCalls/hdmiinput.js → ...ixtures/latest/fireboltCalls/hdmiinput.js
diff --git a/...ess/fixtures/fireboltCalls/hdmiinput.json → ...tures/latest/fireboltCalls/hdmiinput.json b/...ess/fixtures/fireboltCalls/hdmiinput.json → ...tures/latest/fireboltCalls/hdmiinput.json
diff --git a/cypress/fixtures/fireboltCalls/keyboard.json → ...xtures/latest/fireboltCalls/keyboard.json b/cypress/fixtures/fireboltCalls/keyboard.json → ...xtures/latest/fireboltCalls/keyboard.json
diff --git a/...ess/fixtures/fireboltCalls/lifecycle.json → ...tures/latest/fireboltCalls/lifecycle.json b/...ess/fixtures/fireboltCalls/lifecycle.json → ...tures/latest/fireboltCalls/lifecycle.json
diff --git a/...ss/fixtures/fireboltCalls/localization.js → ...ures/latest/fireboltCalls/localization.js b/...ss/fixtures/fireboltCalls/localization.js → ...ures/latest/fireboltCalls/localization.js
diff --git a/.../fixtures/fireboltCalls/localization.json → ...es/latest/fireboltCalls/localization.json b/.../fixtures/fireboltCalls/localization.json → ...es/latest/fireboltCalls/localization.json
diff --git a/cypress/fixtures/fireboltCalls/metrics.js → .../fixtures/latest/fireboltCalls/metrics.js b/cypress/fixtures/fireboltCalls/metrics.js → .../fixtures/latest/fireboltCalls/metrics.js
diff --git a/cypress/fixtures/fireboltCalls/metrics.json → ...ixtures/latest/fireboltCalls/metrics.json b/cypress/fixtures/fireboltCalls/metrics.json → ...ixtures/latest/fireboltCalls/metrics.json
diff --git a/cypress/fixtures/fireboltCalls/parameters.js → ...xtures/latest/fireboltCalls/parameters.js b/cypress/fixtures/fireboltCalls/parameters.js → ...xtures/latest/fireboltCalls/parameters.js
diff --git a/...ss/fixtures/fireboltCalls/parameters.json → ...ures/latest/fireboltCalls/parameters.json b/...ss/fixtures/fireboltCalls/parameters.json → ...ures/latest/fireboltCalls/parameters.json
diff --git a/cypress/fixtures/fireboltCalls/privacy.js → .../fixtures/latest/fireboltCalls/privacy.js b/cypress/fixtures/fireboltCalls/privacy.js → .../fixtures/latest/fireboltCalls/privacy.js
diff --git a/cypress/fixtures/fireboltCalls/privacy.json → ...ixtures/latest/fireboltCalls/privacy.json b/cypress/fixtures/fireboltCalls/privacy.json → ...ixtures/latest/fireboltCalls/privacy.json
diff --git a/cypress/fixtures/fireboltCalls/profile.json → ...ixtures/latest/fireboltCalls/profile.json b/cypress/fixtures/fireboltCalls/profile.json → ...ixtures/latest/fireboltCalls/profile.json
diff --git a/cypress/fixtures/fireboltCalls/sample.json → ...fixtures/latest/fireboltCalls/sample.json b/cypress/fixtures/fireboltCalls/sample.json → ...fixtures/latest/fireboltCalls/sample.json
diff --git a/...ss/fixtures/fireboltCalls/secondscreen.js → ...ures/latest/fireboltCalls/secondscreen.js b/...ss/fixtures/fireboltCalls/secondscreen.js → ...ures/latest/fireboltCalls/secondscreen.js
diff --git a/.../fixtures/fireboltCalls/secondscreen.json → ...es/latest/fireboltCalls/secondscreen.json b/.../fixtures/fireboltCalls/secondscreen.json → ...es/latest/fireboltCalls/secondscreen.json
diff --git a/...s/fixtures/fireboltCalls/securestorage.js → ...res/latest/fireboltCalls/securestorage.js b/...s/fixtures/fireboltCalls/securestorage.js → ...res/latest/fireboltCalls/securestorage.js
diff --git a/...fixtures/fireboltCalls/securestorage.json → ...s/latest/fireboltCalls/securestorage.json b/...fixtures/fireboltCalls/securestorage.json → ...s/latest/fireboltCalls/securestorage.json
diff --git a/...ss/fixtures/fireboltCalls/usergrants.json → ...ures/latest/fireboltCalls/usergrants.json b/...ss/fixtures/fireboltCalls/usergrants.json → ...ures/latest/fireboltCalls/usergrants.json
diff --git a/.../fixtures/fireboltCalls/userinterest.json → ...es/latest/fireboltCalls/userinterest.json b/.../fixtures/fireboltCalls/userinterest.json → ...es/latest/fireboltCalls/userinterest.json
diff --git a/...s/fixtures/fireboltCalls/voiceguidance.js → ...res/latest/fireboltCalls/voiceguidance.js b/...s/fixtures/fireboltCalls/voiceguidance.js → ...res/latest/fireboltCalls/voiceguidance.js
diff --git a/...fixtures/fireboltCalls/voiceguidance.json → ...s/latest/fireboltCalls/voiceguidance.json b/...fixtures/fireboltCalls/voiceguidance.json → ...s/latest/fireboltCalls/voiceguidance.json
diff --git a/cypress/fixtures/fireboltCalls/wifi.js → ...ess/fixtures/latest/fireboltCalls/wifi.js b/cypress/fixtures/fireboltCalls/wifi.js → ...ess/fixtures/latest/fireboltCalls/wifi.js
diff --git a/cypress/fixtures/fireboltCalls/wifi.json → ...s/fixtures/latest/fireboltCalls/wifi.json b/cypress/fixtures/fireboltCalls/wifi.json → ...s/fixtures/latest/fireboltCalls/wifi.json
diff --git a/...ixtures/fireboltMocks/clearEventData.json → .../latest/fireboltMocks/clearEventData.json b/...ixtures/fireboltMocks/clearEventData.json → .../latest/fireboltMocks/clearEventData.json
diff --git a/cypress/fixtures/grantPolicy.json → cypress/fixtures/latest/grantPolicy.json b/cypress/fixtures/grantPolicy.json → cypress/fixtures/latest/grantPolicy.json
diff --git a/...ess/fixtures/grantPolicyDependencies.json → ...tures/latest/grantPolicyDependencies.json b/...ess/fixtures/grantPolicyDependencies.json → ...tures/latest/grantPolicyDependencies.json
diff --git a/cypress/fixtures/modules/accessibility.json → ...ixtures/latest/modules/accessibility.json b/cypress/fixtures/modules/accessibility.json → ...ixtures/latest/modules/accessibility.json
diff --git a/cypress/fixtures/modules/account.json → cypress/fixtures/latest/modules/account.json b/cypress/fixtures/modules/account.json → cypress/fixtures/latest/modules/account.json
diff --git a/cypress/fixtures/modules/advertising.json → .../fixtures/latest/modules/advertising.json b/cypress/fixtures/modules/advertising.json → .../fixtures/latest/modules/advertising.json
diff --git a/...s/fixtures/modules/audiodescriptions.json → ...res/latest/modules/audiodescriptions.json b/...s/fixtures/modules/audiodescriptions.json → ...res/latest/modules/audiodescriptions.json
diff --git a/cypress/fixtures/modules/authentication.json → ...xtures/latest/modules/authentication.json b/cypress/fixtures/modules/authentication.json → ...xtures/latest/modules/authentication.json
diff --git a/cypress/fixtures/modules/capabilities.json → ...fixtures/latest/modules/capabilities.json b/cypress/fixtures/modules/capabilities.json → ...fixtures/latest/modules/capabilities.json
diff --git a/cypress/fixtures/modules/closedcaptions.json → ...xtures/latest/modules/closedcaptions.json b/cypress/fixtures/modules/closedcaptions.json → ...xtures/latest/modules/closedcaptions.json
diff --git a/cypress/fixtures/modules/device.json → cypress/fixtures/latest/modules/device.json b/cypress/fixtures/modules/device.json → cypress/fixtures/latest/modules/device.json
diff --git a/cypress/fixtures/modules/discovery.json → ...ss/fixtures/latest/modules/discovery.json b/cypress/fixtures/modules/discovery.json → ...ss/fixtures/latest/modules/discovery.json
diff --git a/cypress/fixtures/modules/hdmiinput.json → ...ss/fixtures/latest/modules/hdmiinput.json b/cypress/fixtures/modules/hdmiinput.json → ...ss/fixtures/latest/modules/hdmiinput.json
diff --git a/cypress/fixtures/modules/keyboard.json → ...ess/fixtures/latest/modules/keyboard.json b/cypress/fixtures/modules/keyboard.json → ...ess/fixtures/latest/modules/keyboard.json
diff --git a/cypress/fixtures/modules/lifecycle.json → ...ss/fixtures/latest/modules/lifecycle.json b/cypress/fixtures/modules/lifecycle.json → ...ss/fixtures/latest/modules/lifecycle.json
diff --git a/cypress/fixtures/modules/localization.json → ...fixtures/latest/modules/localization.json b/cypress/fixtures/modules/localization.json → ...fixtures/latest/modules/localization.json
diff --git a/cypress/fixtures/modules/metrics.json → cypress/fixtures/latest/modules/metrics.json b/cypress/fixtures/modules/metrics.json → cypress/fixtures/latest/modules/metrics.json
diff --git a/cypress/fixtures/modules/parameters.json → ...s/fixtures/latest/modules/parameters.json b/cypress/fixtures/modules/parameters.json → ...s/fixtures/latest/modules/parameters.json
diff --git a/cypress/fixtures/modules/privacy.json → cypress/fixtures/latest/modules/privacy.json b/cypress/fixtures/modules/privacy.json → cypress/fixtures/latest/modules/privacy.json
diff --git a/cypress/fixtures/modules/profile.json → cypress/fixtures/latest/modules/profile.json b/cypress/fixtures/modules/profile.json → cypress/fixtures/latest/modules/profile.json
diff --git a/cypress/fixtures/modules/secondscreen.json → ...fixtures/latest/modules/secondscreen.json b/cypress/fixtures/modules/secondscreen.json → ...fixtures/latest/modules/secondscreen.json
diff --git a/cypress/fixtures/modules/securestorage.json → ...ixtures/latest/modules/securestorage.json b/cypress/fixtures/modules/securestorage.json → ...ixtures/latest/modules/securestorage.json
diff --git a/cypress/fixtures/modules/usergrants.json → ...s/fixtures/latest/modules/usergrants.json b/cypress/fixtures/modules/usergrants.json → ...s/fixtures/latest/modules/usergrants.json
diff --git a/cypress/fixtures/modules/voiceguidance.json → ...ixtures/latest/modules/voiceguidance.json b/cypress/fixtures/modules/voiceguidance.json → ...ixtures/latest/modules/voiceguidance.json
diff --git a/cypress/fixtures/modules/wifi.json → cypress/fixtures/latest/modules/wifi.json b/cypress/fixtures/modules/wifi.json → cypress/fixtures/latest/modules/wifi.json
diff --git a/...s/fixtures/objects/errorContentObjects.js → ...res/latest/objects/errorContentObjects.js b/...s/fixtures/objects/errorContentObjects.js → ...res/latest/objects/errorContentObjects.js
diff --git a/...fixtures/objects/errorContentObjects.json → ...s/latest/objects/errorContentObjects.json b/...fixtures/objects/errorContentObjects.json → ...s/latest/objects/errorContentObjects.json
diff --git a/.../fixtures/objects/lifecycleAppObject.json → ...es/latest/objects/lifecycleAppObject.json b/.../fixtures/objects/lifecycleAppObject.json → ...es/latest/objects/lifecycleAppObject.json
diff --git a/...ures/objects/moduleReqId/moduleReqId.json → ...test/objects/moduleReqId/moduleReqId.json b/...ures/objects/moduleReqId/moduleReqId.json → ...test/objects/moduleReqId/moduleReqId.json
diff --git a/...ects/validationObjects/accessibility.json → ...ects/validationObjects/accessibility.json b/...ects/validationObjects/accessibility.json → ...ects/validationObjects/accessibility.json
diff --git a/...bjects/validationObjects/advertising.json → ...bjects/validationObjects/advertising.json b/...bjects/validationObjects/advertising.json → ...bjects/validationObjects/advertising.json
diff --git a/...s/validationObjects/audiodescription.json → ...s/validationObjects/audiodescription.json b/...s/validationObjects/audiodescription.json → ...s/validationObjects/audiodescription.json
diff --git a/...cts/validationObjects/authentication.json → ...cts/validationObjects/authentication.json b/...cts/validationObjects/authentication.json → ...cts/validationObjects/authentication.json
diff --git a/...jects/validationObjects/capabilities.json → ...jects/validationObjects/capabilities.json b/...jects/validationObjects/capabilities.json → ...jects/validationObjects/capabilities.json
diff --git a/...cts/validationObjects/closedcaptions.json → ...cts/validationObjects/closedcaptions.json b/...cts/validationObjects/closedcaptions.json → ...cts/validationObjects/closedcaptions.json
diff --git a/...res/objects/validationObjects/device.json → ...est/objects/validationObjects/device.json b/...res/objects/validationObjects/device.json → ...est/objects/validationObjects/device.json
diff --git a/.../objects/validationObjects/discovery.json → .../objects/validationObjects/discovery.json b/.../objects/validationObjects/discovery.json → .../objects/validationObjects/discovery.json
diff --git a/...ts/validationObjects/discoverylaunch.json → ...ts/validationObjects/discoverylaunch.json b/...ts/validationObjects/discoverylaunch.json → ...ts/validationObjects/discoverylaunch.json
diff --git a/.../objects/validationObjects/hdmiinput.json → .../objects/validationObjects/hdmiinput.json b/.../objects/validationObjects/hdmiinput.json → .../objects/validationObjects/hdmiinput.json
diff --git a/...s/objects/validationObjects/keyboard.json → ...t/objects/validationObjects/keyboard.json b/...s/objects/validationObjects/keyboard.json → ...t/objects/validationObjects/keyboard.json
diff --git a/.../objects/validationObjects/lifecycle.json → .../objects/validationObjects/lifecycle.json b/.../objects/validationObjects/lifecycle.json → .../objects/validationObjects/lifecycle.json
diff --git a/...jects/validationObjects/localization.json → ...jects/validationObjects/localization.json b/...jects/validationObjects/localization.json → ...jects/validationObjects/localization.json
diff --git a/...objects/validationObjects/parameters.json → ...objects/validationObjects/parameters.json b/...objects/validationObjects/parameters.json → ...objects/validationObjects/parameters.json
diff --git a/...es/objects/validationObjects/privacy.json → ...st/objects/validationObjects/privacy.json b/...es/objects/validationObjects/privacy.json → ...st/objects/validationObjects/privacy.json
diff --git a/...es/objects/validationObjects/profile.json → ...st/objects/validationObjects/profile.json b/...es/objects/validationObjects/profile.json → ...st/objects/validationObjects/profile.json
diff --git a/...jects/validationObjects/secondscreen.json → ...jects/validationObjects/secondscreen.json b/...jects/validationObjects/secondscreen.json → ...jects/validationObjects/secondscreen.json
diff --git a/...ects/validationObjects/securestorage.json → ...ects/validationObjects/securestorage.json b/...ects/validationObjects/securestorage.json → ...ects/validationObjects/securestorage.json
diff --git a/...objects/validationObjects/usergrants.json → ...objects/validationObjects/usergrants.json b/...objects/validationObjects/usergrants.json → ...objects/validationObjects/usergrants.json
diff --git a/...ects/validationObjects/voiceguidance.json → ...ects/validationObjects/voiceguidance.json b/...ects/validationObjects/voiceguidance.json → ...ects/validationObjects/voiceguidance.json
diff --git a/...tures/objects/validationObjects/wifi.json → ...atest/objects/validationObjects/wifi.json b/...tures/objects/validationObjects/wifi.json → ...atest/objects/validationObjects/wifi.json
diff --git a/cypress/fixtures/regexformats.js → cypress/fixtures/latest/regexformats.js b/cypress/fixtures/regexformats.js → cypress/fixtures/latest/regexformats.js
diff --git a/cypress/fixtures/schemas/errorSchema.json → .../fixtures/latest/schemas/errorSchema.json b/cypress/fixtures/schemas/errorSchema.json → .../fixtures/latest/schemas/errorSchema.json
diff --git a/...tures/schemas/lifecycleHistorySchema.json → ...atest/schemas/lifecycleHistorySchema.json b/...tures/schemas/lifecycleHistorySchema.json → ...atest/schemas/lifecycleHistorySchema.json
diff --git a/cypress/fixtures/setResponseData.json → cypress/fixtures/latest/setResponseData.json b/cypress/fixtures/setResponseData.json → cypress/fixtures/latest/setResponseData.json
diff --git a/...ss/fixtures/versions/0.11.0/firebolt.json → ...ures/latest/versions/0.11.0/firebolt.json b/...ss/fixtures/versions/0.11.0/firebolt.json → ...ures/latest/versions/0.11.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.12.0/firebolt.json → ...ures/latest/versions/0.12.0/firebolt.json b/...ss/fixtures/versions/0.12.0/firebolt.json → ...ures/latest/versions/0.12.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.13.0/firebolt.json → ...ures/latest/versions/0.13.0/firebolt.json b/...ss/fixtures/versions/0.13.0/firebolt.json → ...ures/latest/versions/0.13.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.14.0/firebolt.json → ...ures/latest/versions/0.14.0/firebolt.json b/...ss/fixtures/versions/0.14.0/firebolt.json → ...ures/latest/versions/0.14.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.15.0/firebolt.json → ...ures/latest/versions/0.15.0/firebolt.json b/...ss/fixtures/versions/0.15.0/firebolt.json → ...ures/latest/versions/0.15.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.16.0/firebolt.json → ...ures/latest/versions/0.16.0/firebolt.json b/...ss/fixtures/versions/0.16.0/firebolt.json → ...ures/latest/versions/0.16.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.17.0/firebolt.json → ...ures/latest/versions/0.17.0/firebolt.json b/...ss/fixtures/versions/0.17.0/firebolt.json → ...ures/latest/versions/0.17.0/firebolt.json
diff --git a/...ss/fixtures/versions/0.17.1/firebolt.json → ...ures/latest/versions/0.17.1/firebolt.json b/...ss/fixtures/versions/0.17.1/firebolt.json → ...ures/latest/versions/0.17.1/firebolt.json
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
@@ -46,7 +46,9 @@ let metaDataArr = [];
 module.exports = async (on, config) => {
   // To set the specPattern dynamically based on the testSuite
   const testsuite = config.env.testSuite;
-  const specPattern = getSpecPattern(testsuite);
+  const sdkVersion = config.env.sdkVersion || 'latest';
+  CONSTANTS.setSdkVersion(sdkVersion);
+  const specPattern = getSpecPattern(testsuite, sdkVersion);
   if (specPattern !== undefined) {
     config.specPattern = specPattern;
   }
@@ -93,6 +95,32 @@ module.exports = async (on, config) => {
       logger.info(message);
       return null;
     },
+    getFireboltCallsData({ sdkVersion }) {
+      console.log(
+        'sdkversion inside index.js:------------------------->>>>>>>>>>>>>>>>>> ',
+        sdkVersion
+      );
+      let data;
+
+      const internalPath = path.resolve(
+        __dirname,
+        `../fixtures/${sdkVersion}/fireboltCalls/index.js`
+      );
+
+      try {
+        if (fs.existsSync(internalPath)) {
+          data = fs.readFileSync(internalPath, 'utf-8');
+          console.log('data 2204: _______>>>>>', data);
+          return data;
+        } else {
+          console.log(`Internal fireboltCalls data file not found: ${internalPath}`);
+        }
+      } catch (err) {
+        console.error(`Error reading files:`, err);
+      }
+
+      return data;
+    },
     /* write json or string to file
     @param fileName - complete file name with path
     @param data - json or string
@@ -310,9 +338,11 @@ module.exports = async (on, config) => {
           if (fs.existsSync(tempReportEnv)) reportProperties.reportEnv = require(tempReportEnv);
           let customReportData;
           try {
-            customReportData = require('../fixtures/external/objects/customReportData.json');
+            customReportData = require(
+              `../fixtures/external/${sdkVersion}/objects/customReportData.json`
+            );
           } catch (error) {
-            customReportData = require('../fixtures/customReportData.json');
+            customReportData = require(`../fixtures/${sdkVersion}/customReportData.json`);
           }
           reportProperties.isCombinedTestRun = process.env.CYPRESS_isCombinedTestRun;
           reportProperties.customReportData = customReportData;

diff --git a/cypress/plugins/localReportGenerator.js b/cypress/plugins/localReportGenerator.js
@@ -73,10 +73,13 @@ async function generateLocalReport(reportObj, jobId) {
     // Move cucumber json to a separate directory and get the path
     const cucumberDir = await filterCucumberJson(reportObj.cucumberReportFilePath);
     let customReportData;
+    const sdkVersion = config.env.sdkVersion || 'latest';
     try {
-      customReportData = require('../fixtures/external/objects/customReportData.json');
+      customReportData = require(
+        `../fixtures/external/${sdkVersion}/objects/customReportData.json`
+      );
     } catch (error) {
-      customReportData = require('../fixtures/customReportData.json');
+      customReportData = require(`../fixtures/${sdkVersion}/customReportData.json`);
     }
     // Configure cucumber report options
     reportEnv.jsonDir = cucumberDir;

diff --git a/cypress/plugins/pluginUtils.js b/cypress/plugins/pluginUtils.js
@@ -137,7 +137,8 @@ function preprocessDeviceData(config) {
       logger.error('Device MAC address is required.');
     }
     const formattedDeviceMac = deviceMac.replace(/:/g, '').toUpperCase();
-    const jsonFilePath = `cypress/fixtures/external/devices/${formattedDeviceMac}.json`;
+    const sdkVersion = config.env.sdkVersion || 'latest';
+    const jsonFilePath = `cypress/fixtures/external/${sdkVersion}/devices/${formattedDeviceMac}.json`;
     let deviceData;
 
     try {

diff --git a/cypress/plugins/testDataProcessor.js b/cypress/plugins/testDataProcessor.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const jsonMerger = require('json-merger');
 const CONSTANTS = require('../support/constants/constants');
-const REGEXFORMATS = require('../fixtures/regexformats');
+const REGEXFORMATS = require('../fixtures/latest/regexformats');
 let envVariables;
 const path = require('path');
 const _ = require('lodash');

diff --git a/cypress/plugins/testDataProcessor.md b/cypress/plugins/testDataProcessor.md
@@ -73,7 +73,7 @@ Currently supported requestType is params, context and content.
    * Error validation
    * Result validation
     - Static Content Validation - Required content will be fetched from combined(fcs and config module) `default json` or from the corresponding `module json` files based on the precedence.
-      - `module.json` files reside in `fixtures/modules/` or `fixtures/external/modules/`
+      - `module.json` files reside in `fixtures/<sdkVersion>/modules/` or `fixtures/external/<sdkVersion>/modules/`
 
     - Device Content Validation
       - Content will be fetched from `devicMac.json` file when devicMac is present. 

diff --git a/cypress/support/constants/constants.js b/cypress/support/constants/constants.js
@@ -15,6 +15,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+let sdkVersion = 'latest';
+const setSdkVersion = (version) => {
+  sdkVersion = version;
+  console.log('sdk version after set: ' + sdkVersion);
+};
+
 module.exports = {
   ACTION: 'action',
   ACTION_CORE: 'CORE',
@@ -44,7 +50,7 @@ module.exports = {
   BEFORE_OPERATION: 'beforeOperation',
   BEFORE_OPERATION_TAGS: 'beforeOperationTags',
   BEFORE_OPERATION_FORMAT:
-    'Before operation object is not in proper array format, recheck the before objects in fixture/external/moduleReqId - getBeforeOperationObject',
+    'Before operation object is not in proper array format, recheck the before objects in fixture/external/<sdkVersion>/moduleReqId - getBeforeOperationObject',
   BOOLEAN: 'boolean',
   CAPABILITIES_INFO: 'capabilities.info',
   CAPABILITIES_PERMITTED: 'capabilities.permitted',
@@ -58,25 +64,25 @@ module.exports = {
   SUITE_COMMUNICATION_MODE: 'suiteCommunicationMode',
   CONFIG: 'CONFIG',
   CONFIG_IMPLEMENTATION_MISSING: 'Config module implementation missing',
-  CONFIG_MODULE_SETRESPONSE_PATH: 'cypress/fixtures/external/setResponseData.json',
+  CONFIG_MODULE_SETRESPONSE_PATH: `cypress/fixtures/external/${sdkVersion}/setResponseData.json`,
   CONTENT: 'Content',
   CONTEXT: 'Context',
-  CONTEXT_FILE_PATH: 'cypress/fixtures/apiObjectContext.json',
+  CONTEXT_FILE_PATH: `cypress/fixtures/${sdkVersion}/apiObjectContext.json`,
   CORE: 'core',
   CORRELATIONID: 'correlationId',
   COUNTRYCODE: 'countryCode',
   CUCUMBER: 'cucumber',
   CURRENT_APP_ID: 'currentAppId',
   CUSTOM_METHOD_PATH:
     'https://github.com/rdkcentral/firebolt-certification-suite/blob/main/cypress/fixtures/docs/validations.md#custom',
-  CYPRESS_MODULES_PATH: 'cypress/fixtures/external/modules',
+  CYPRESS_MODULES_PATH: `cypress/fixtures/external/${sdkVersion}/modules`,
   DATE: 'date',
   DECIMAL: 'decimal',
   DECODE: 'decode',
   DECODEVALUE_JSON_PATH: 'decodeValue.json',
-  DEFAULT_DEVICE_DATA_PATH: 'cypress/fixtures/defaultDeviceData.json',
+  DEFAULT_DEVICE_DATA_PATH: `cypress/fixtures/${sdkVersion}/defaultDeviceData.json`,
   DEFAULT_DIRECTORY: '/tmp/jsonReports/',
-  DEFAULT_PATH: 'cypress/fixtures/defaultTestData.json',
+  DEFAULT_PATH: `cypress/fixtures/${sdkVersion}/defaultTestData.json`,
   DEFAULT_TEST_DATA: 'defaultTestData.json',
   DEREFERENCE_OPENRPC: 'dereferenceOpenRPC',
   DEVICE: 'device',
@@ -126,7 +132,7 @@ module.exports = {
   ERROR_LIST: ['Method not found', 'Method Not Implemented'],
   ERROR_NOT_UNDEFINED_CHECK: 'Error not undefined Check',
   ERROR_NULL_CHECK: 'Error null Check',
-  ERROR_CONTENT_OBJECTS_PATH: 'cypress/fixtures/objects/errorContentObjects.json',
+  ERROR_CONTENT_OBJECTS_PATH: `cypress/fixtures/${sdkVersion}/objects/errorContentObjects.json`,
   EVENT: 'event',
   EVENT_ERROR_MSG: 'Event listener error validation',
   EVENT_LISTENER_RESPONSE: 'eventListenerResponse',
@@ -153,11 +159,11 @@ module.exports = {
   EXPECTED_JSON_IN_VALIDATION_OBJECTS:
     'Expected JSON data should be defined in fixtures/objects/validationObjects/',
   EXPECTING_ERROR: 'expectingError',
-  EXTERNAL_ERROR_CONTENT_OBJECTS_PATH: 'cypress/fixtures/external/objects/errorContentObjects.json',
-  EXTERNAL_DEVICES_PATH: 'cypress/fixtures/external/devices/',
-  EXTERNAL_MODULEREQID_PATH: 'cypress/fixtures/external/objects/moduleReqId/moduleReqId.json',
-  EXTERNAL_PATH: 'cypress/fixtures/external/modules/',
-  EXTERNAL_PREREQUISITE_DATA: './cypress/fixtures/external/PreRequisiteData.json',
+  EXTERNAL_ERROR_CONTENT_OBJECTS_PATH: `cypress/fixtures/external/${sdkVersion}/objects/errorContentObjects.json`,
+  EXTERNAL_DEVICES_PATH: `cypress/fixtures/external/${sdkVersion}/devices/`,
+  EXTERNAL_MODULEREQID_PATH: `cypress/fixtures/external/${sdkVersion}/objects/moduleReqId/moduleReqId.json`,
+  EXTERNAL_PATH: `cypress/fixtures/external/${sdkVersion}/modules/`,
+  EXTERNAL_PREREQUISITE_DATA: `./cypress/fixtures/external/${sdkVersion}/PreRequisiteData.json`,
   EXTRACTEDAPI_PATH: 'extractedApiObject.apiResponse.',
   FAIL: 'FAIL',
   FAIL_ON_PUBSUB_CONNECTION_ERROR: 'failOnPubSubConnectionError',
@@ -171,26 +177,26 @@ module.exports = {
   FCA_APP_LIST: 'fcaAppList',
   FB_INTERACTIONLOGS: 'fbInteractionLogs',
   FCS: 'fcs',
-  FCS_MODULEREQID_PATH: 'cypress/fixtures/objects/moduleReqId/moduleReqId.json',
-  FCS_SETRESPONSE_PATH: 'cypress/fixtures/setResponseData.json',
+  FCS_MODULEREQID_PATH: `cypress/fixtures/${sdkVersion}/objects/moduleReqId/moduleReqId.json`,
+  FCS_SETRESPONSE_PATH: `cypress/fixtures/${sdkVersion}/setResponseData.json`,
   FCS_VALIDATION_JSON: 'fCSValidationjson',
   FIREBOLT: 'firebolt',
   FIREBOLTCALL: 'fireboltCall',
   FIREBOLT_OBJECT_DOC_PATH:
     'https://github.com/rdkcentral/firebolt-certification-suite/blob/main/cypress/fixtures/docs/dynamicObjects.md#firebolt-object',
   FIREBOLT_VERSION: 'Firebolt Version',
-  FIREBOLTCALLS_FROM_CONFIGMODULE: 'cypress/fixtures/external/fireboltCalls/',
-  FIREBOLTCALLS_FROM_FCS: 'cypress/fixtures/fireboltCalls/',
+  FIREBOLTCALLS_FROM_CONFIGMODULE: `cypress/fixtures/external/${sdkVersion}/fireboltCalls/`,
+  FIREBOLTCALLS_FROM_FCS: `cypress/fixtures/${sdkVersion}/fireboltCalls/`,
   FIREBOLTCONFIG: 'fireboltConfig',
   FIREBOLTMOCK: 'fireboltMock',
-  FIREBOLTMOCK_FROM_CONFIGMODULE: 'cypress/fixtures/external/fireboltMocks/',
-  FIREBOLTMOCK_FROM_FCS: 'cypress/fixtures/fireboltMocks/',
+  FIREBOLTMOCK_FROM_CONFIGMODULE: `cypress/fixtures/external/${sdkVersion}/fireboltMocks/`,
+  FIREBOLTMOCK_FROM_FCS: `cypress/fixtures/${sdkVersion}/fireboltMocks/`,
   FIREBOLT_SPECIFICATION_NEXT_URL: 'firebolt_specification_next_url',
   FIREBOLT_SPECIFICATION_PROPOSED_URL: 'firebolt_specification_proposed_url',
   FIREBOLT_SPECIFICATION_URL: 'firebolt_specification_url',
   FIRST_PARTY_APP: '1st party app',
-  VALIDATION_OBJECTS_PATH: 'cypress/fixtures/objects/validationObjects/',
-  CONFIG_VALIDATION_OBJECTS_PATH: 'cypress/fixtures/external/objects/validationObjects/',
+  VALIDATION_OBJECTS_PATH: `cypress/fixtures/${sdkVersion}/objects/validationObjects/`,
+  CONFIG_VALIDATION_OBJECTS_PATH: `cypress/fixtures/external/${sdkVersion}/objects/validationObjects/`,
   FIXTURE: 'fixture',
   FIXTURE_DEFINED_PATH:
     'Expected JSON data should be defined in fixtures/objects/validationObjects/',
@@ -277,7 +283,7 @@ module.exports = {
   MODE_SDK: 'SDK',
   MODE_TRANSPORT: 'Transport',
   MODULEREQIDJSON: 'moduleReqIdJson',
-  MODULES_PATH: 'cypress/fixtures/modules/',
+  MODULES_PATH: `cypress/fixtures/${sdkVersion}/modules/`,
   MODULE_NAMES: {
     DEVICE: 'device',
     ADVERTISING: 'advertising',
@@ -338,8 +344,8 @@ module.exports = {
   PUB_SUB_PUBLISH_SUFFIX: 'pubSubPublishSuffix',
   PUB_SUB_SUBSCRIBE_SUFFIX: 'pubSubSubscribeSuffix',
   SETUPCHECK: 'Setup Check',
-  SETUPVALUES: 'external/setupValues.json',
-  SETUPVALUES_FILEPATH: 'cypress/fixtures/external/setupValues.json',
+  SETUPVALUES: `external/${sdkVersion}/setupValues.json`,
+  SETUPVALUES_FILEPATH: `cypress/fixtures/external/${sdkVersion}/setupValues.json`,
   PREVIOUS_TEST_TYPE: 'previousTestType',
   PROPOSED: 'proposed',
   PUBLISH: 'publish',
@@ -489,8 +495,8 @@ module.exports = {
   CREATE_MARKER: 'createMarker',
   MODULE_OVERRIDES: ['fcs', 'performance'],
   COMBINEDDEFAULTTESTDATA: 'combinedDefaultTestData',
-  CONFIG_DEFAULTTESTDATA_PATH: 'cypress/fixtures/external/defaultTestData.json',
-  FCS_DEFAULTTESTDATA_PATH: 'cypress/fixtures/defaultTestData.json',
+  CONFIG_DEFAULTTESTDATA_PATH: `cypress/fixtures/external/${sdkVersion}/defaultTestData.json`,
+  FCS_DEFAULTTESTDATA_PATH: `cypress/fixtures/${sdkVersion}/defaultTestData.json`,
   ENV_SETUP_STATUS: 'environmentLaunched',
   APP_LAUNCH_STATUS: 'appLaunched',
   VISIBILITYSTATE_VALIDATION_REQ: ' Lifecycle visibility state validation ',
@@ -518,6 +524,7 @@ module.exports = {
   FOREGROUND: 'FOREGROUND',
   PERFORMANCE_VALIDATION: 'performanceValidation',
   MARKER_CREATION_STATUS: 'markerCreationStatus',
+  setSdkVersion,
 };
 function getSanityReportPath() {
   // Check if Cypress is defined, for cypress test context

diff --git a/cypress/support/cypress-commands/commands.js b/cypress/support/cypress-commands/commands.js
@@ -260,7 +260,8 @@ Cypress.Commands.add('updateRunInfo', () => {
               return false;
             }
             const deviceMac = UTILS.getEnvVariable(CONSTANTS.DEVICE_MAC).replace(/:/g, '');
-            const deviceMacJson = `./cypress/fixtures/devices/${deviceMac}.json`;
+            const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest';
+            const deviceMacJson = `./cypress/fixtures/${sdkVersion}/devices/${deviceMac}.json`;
             // Check if mac json file exists
             cy.task('checkFileExists', deviceMacJson)
               .then((exists) => {
@@ -434,7 +435,8 @@ Cypress.Commands.add('getDeviceDataFromThirdPartyApp', (method, params, action)
  * cy.getLatestFireboltJsonFromFixtures()
  */
 Cypress.Commands.add('getLatestFireboltJsonFromFixtures', () => {
-  cy.task('readFilesFromDir', 'cypress/fixtures/versions/').then((filesData) => {
+  const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest';
+  cy.task('readFilesFromDir', `cypress/fixtures/${sdkVersion}/versions/`).then((filesData) => {
     try {
       // Reading a greater version value from the versions folder.
       const version = filesData
@@ -495,7 +497,8 @@ Cypress.Commands.add('getFireboltJsonData', () => {
 
     //  If cy.request fails, get specific firebolt.json from -cypress/fixtures/versions/${Cypress.env(CONSTANTS.SDK_VERSION)}/firebolt.json
     else {
-      const configImportPath = `cypress/fixtures/versions/${UTILS.getEnvVariable(
+      const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest';
+      const configImportPath = `cypress/fixtures/${sdkVersion}/versions/${UTILS.getEnvVariable(
         CONSTANTS.SDK_VERSION
       )}/firebolt.json`;
 

diff --git a/cypress/support/cypress-support/src/main.js b/cypress/support/cypress-support/src/main.js
@@ -25,15 +25,21 @@ const defaultDirectory = CONSTANTS.DEFAULT_DIRECTORY;
 const jsonFile = CONSTANTS.JSON_FILE_EXTENSION;
 const UTILS = require('./utils');
 const path = require('path');
+const fs = require('fs');
 const logger = require('../../Logger')('main.js');
 const setimmediate = require('setimmediate');
 let appTransport;
 const flatted = require('flatted');
 const _ = require('lodash');
-const internalV2FireboltCallsData = require('../../../fixtures/fireboltCalls/index');
-const externalV2FireboltCallsData = require('../../../fixtures/external/fireboltCalls/index');
-const internalV2FireboltMockData = require('../../../fixtures/fireboltCalls/index');
-const externalV2FireboltMockData = require('../../../fixtures/external/fireboltCalls/index');
+const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION, false) || 'latest';
+console.log('2204 sdk version: ', sdkVersion);
+const sample = require(`../../../fixtures/latest/fireboltCalls/index`);
+console.log('2204 sdk version: ', sample);
+// console.log('2204 file exists: ', fs.existsSync(sample));
+let internalV2FireboltCallsData,
+  externalV2FireboltCallsData,
+  internalV2FireboltMockData,
+  externalV2FireboltMockData;
 
 export default function (module) {
   const config = new Config(module);
@@ -46,7 +52,11 @@ export default function (module) {
 
   // before All
   before(() => {
-    // Added below custom commands to clear cache and to reload browser
+    cy.task('getFireboltCallsData', { sdkVersion }).then((data) => {
+      internalV2FireboltCallsData = data;
+
+      console.log('2204 Internal Firebolt Calls Data:', internalV2FireboltCallsData);
+    });
     cy.clearCache();
     cy.wrap(UTILS.pubSubClientCreation(appTransport), {
       timeout: CONSTANTS.SEVEN_SECONDS_TIMEOUT,

diff --git a/cypress/support/cypress-support/src/utils.js b/cypress/support/cypress-support/src/utils.js
@@ -434,6 +434,9 @@
  */
 function lifecycleHistorySchemaValidation(result, schema, lifecycleHistoryRecordType, envKey) {
   const schemaValidationResult = validator.validate(result, schema);
+  const sdkVersion = getEnvVariable(
+    CONSTANTS.SDK_VERSION
+  ) || 'latest';
 
   if (
     lifecycleHistoryRecordType == CONSTANTS.TASK.STOPLIFECYCLERECORDING &&
@@ -444,7 +447,7 @@
   ) {
     assert(
       false,
-      `Schema Validation Failed: Response must follow the format specified in "cypress/fixtures/schemas/lifecycleHistorySchema.json", Errors: ${schemaValidationResult.errors} `
+      `Schema Validation Failed: Response must follow the format specified in "cypress/fixtures/${sdkVersion}/schemas/lifecycleHistorySchema.json", Errors: ${schemaValidationResult.errors} `
     );
   }
 

diff --git a/cypress/support/validations/decodeValidation.js b/cypress/support/validations/decodeValidation.js
@@ -15,8 +15,10 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-const REGEXFORMATS = require('../../fixtures/regexformats');
+import UTILS from '../cypress-support/src/utils';
 const CONSTANTS = require('../constants/constants');
+const sdkVersion = UTILS.getEnvVariable(CONSTANTS.SDK_VERSION) || 'latest';
+const REGEXFORMATS = require(`../../fixtures/${sdkVersion}/regexformats`);
 const RegexParser = require('regex-parser');
 
 /**
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     ```
-    While validating, if a key is present in both fcs-validation jsons (eg: cypress/fixtures/objects/validationObjects/accessibility.json ) and also in configModule's validation jsons (eg: in config module : fixtures/objects/validationObjects/account.json ) which will be in cypress/fixtures/external/objects/validationObjects/, it will be checking for the "override" value first. If the override value of config validation object is matching with fcs validation objects data's index value, then that specific object in the data array will be overriden with the object from configModule. Else, the configModule object will be pushed as a new object in the data array.
+    While validating, if a key is present in both fcs-validation jsons (eg: cypress/fixtures/objects/validationObjects/accessibility.json ) and also in configModule's validation jsons (eg: in config module : fixtures/objects/validationObjects/account.json ) which will be in cypress/fixtures/external/<sdkVersion>objects/validationObjects/, it will be checking for the "override" value first. If the override value of config validation object is matching with fcs validation objects data's index value, then that specific object in the data array will be overriden with the object from configModule. Else, the configModule object will be pushed as a new object in the data array.
     ### Example:
@@ Expand Down @@