GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1153:07d7d7f01c19

Adds "local server" mode...

Alexandre Leroux -

r1153:07d7d7f01c19

parent child

Context file:

r1153:07d7d7f01c19

Collapse all files

cmake/sciqlop_applications.cmake +1 0

                 # - "default": default AMDA server
                 # - "amdatest": AMDA test server
                 # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
+            	# - "localhost": use local AMDA server
                 # Any other value will lead to the use of the default server
                 ADD_DEFINITIONS(-DSCIQLOP_AMDA_SERVER="hybrid")

meson.build +1 0

             # - "default": default AMDA server
             # - "amdatest": AMDA test server
             # - "hybrid": use both the default server and the test server (the server used is relative to each product, according to its "server" property in the JSON file)
+            # - "localhost": use local AMDA server
             # Any other value will lead to the use of the default server
             add_project_arguments('-DSCIQLOP_AMDA_SERVER="hybrid"', language : 'cpp')

plugins/amda/src/AmdaServer.cpp +21 0

             /// URL of the AMDA test server
             const auto AMDA_TEST_SERVER_URL = QStringLiteral("amdatest.irap.omp.eu");
+            /// Port used for local server
+            const auto AMDA_LOCAL_SERVER_PORT = 6543;
+            /// URL of the local server
+            const auto AMDA_LOCAL_SERVER_URL
+                = QString{"localhost:%1"}.arg(QString::number(AMDA_LOCAL_SERVER_PORT));
             /// Default AMDA server
             struct AmdaDefaultServer : public AmdaServer {
             public:
                 }
             };
+            /// Local AMDA server: use local python server to simulate AMDA requests
+            struct AmdaLocalServer : public AmdaServer {
+            public:
+                QString name() const override { return AMDA_LOCAL_SERVER_URL; }
+                QString url(const QVariantHash &properties) const override
+                {
+                    Q_UNUSED(properties);
+                    return AMDA_LOCAL_SERVER_URL;
+                }
+            };
             /// @return an AMDA server instance created from the name of the server passed in parameter. If the
             /// name does not match any known server, a default server instance is created
             std::unique_ptr<AmdaServer> createInstance(const QString &server)
                 else if (server == QString{"hybrid"}) {
                     return std::make_unique<AmdaHybridServer>();
                 }
+                else if (server == QString{"localhost"}) {
+                    return std::make_unique<AmdaLocalServer>();
+                }
                 else {
                     if (server != QString{"default"}) {
                         qCWarning(LOG_AmdaServer())

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages