Updated the mirrored services list to conform with new architecture.
Updated examples to follow the new services architecture
Change-Id: I4588be9a030db40846a8130e2f79c25b423b96ad
diff --git a/manager/app4mc-cloud-manager-app/src/main/resources/services_mirror.txt b/manager/app4mc-cloud-manager-app/src/main/resources/services_mirror.txt
index 495500f..2f21d9a 100644
--- a/manager/app4mc-cloud-manager-app/src/main/resources/services_mirror.txt
+++ b/manager/app4mc-cloud-manager-app/src/main/resources/services_mirror.txt
@@ -1,9 +1,7 @@
migration;Migration;https://cloud.panorama-research.org/app4mc/migration/
validation;Validation;https://cloud.panorama-research.org/app4mc/validation/
rtc_analysis;RTC Analysis;https://cloud.panorama-research.org/app4mc/analysis/
-rtc_interpreter;RTC Evaluation;https://cloud.panorama-research.org/app4mc/interpreter/rtc/
dse_analysis;DSE Analysis;https://cloud.panorama-research.org/app4mc/analysis/waters2019/
-dse_interpreter;DSE Evaluation;https://cloud.panorama-research.org/app4mc/interpreter/dse/
model_analysis;Model Analysis;https://cloud.panorama-research.org/app4mc/interpreter/labels/
optimization;Model Optimization;https://cloud.panorama-research.org/app4mc/optimization/waters2019/
chart_visualizer;Chart Visualizer;https://cloud.panorama-research.org/app4mc/visualization/
diff --git a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_mixed.json b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_mixed.json
index cfecd45..f58d108 100644
--- a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_mixed.json
+++ b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_mixed.json
@@ -4,7 +4,7 @@
"migration" : { },
"validation" : {
"profiles" : "Amalthea Standard Validations",
- "label_interpreter" : {
+ "model_analysis" : {
"label-metrics" : "Label-Per-Core,Label-Per-Task,Label-Per-Memory,Label-Per-Size",
"chart_visualizer" : { }
}
diff --git a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_tree.json b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_tree.json
index 48f1695..975499a 100644
--- a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_tree.json
+++ b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_label_interpreter_tree.json
@@ -3,7 +3,7 @@
"services" : {
"migration" : {
"validation" : {
- "label_interpreter" : {
+ "model_analysis" : {
"label-metrics" : "Label-Per-Core,Label-Per-Task,Label-Per-Memory,Label-Per-Size",
"chart_visualizer" : { }
}
diff --git a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_mixed.json b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_mixed.json
index 65d8d21..1ffd308 100644
--- a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_mixed.json
+++ b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_mixed.json
@@ -4,7 +4,7 @@
"migration" : { },
"validation" : {
"profiles" : "Amalthea Standard Validations,APP4MC.sim Validations",
- "label_interpreter" : {
+ "model_analysis" : {
"label-metrics" : "Label-Per-Core,Label-Per-Task,Label-Per-Memory,Label-Per-Size",
"chart_visualizer" : { }
},
@@ -13,7 +13,6 @@
"analysis-ignore-overutilization" : "true",
"analysis-time-unit" : ""
},
- "rtc_interpreter" : { },
"chart_visualizer" : { }
},
"systemc_simulation" : {
diff --git a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_tree.json b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_tree.json
index 674ef96..d4c864c 100644
--- a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_tree.json
+++ b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/all_services_tree.json
@@ -8,24 +8,10 @@
"label-metrics" : "Label-Per-Core,Label-Per-Task,Label-Per-Memory,Label-Per-Size",
"chart_visualizer" : { }
},
- "label_core_interpreter" : {
- "chart_visualizer" : { }
- },
- "label_memory_interpreter" : {
- "chart_visualizer" : { }
- },
- "label_task_interpreter" : {
- "chart_visualizer" : { }
- },
- "label_size_interpreter" : {
- "chart_visualizer" : { }
- },
"rtc_analysis" : {
"analysis-ignore-overutilization" : "true",
"analysis-time-unit" : "",
- "rtc_interpreter" : {
- "chart_visualizer" : { }
- }
+ "chart_visualizer" : { }
},
"amlt2systemc" : {
"app4mc_sim" : {
diff --git a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/rtc_analysis_sequential.json b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/rtc_analysis_sequential.json
index f6cc349..46457ed 100644
--- a/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/rtc_analysis_sequential.json
+++ b/manager/app4mc-cloud-manager-app/src/main/resources/static/example_configurations/rtc_analysis_sequential.json
@@ -7,7 +7,6 @@
"analysis-ignore-overutilization" : "true",
"analysis-time-unit" : ""
},
- "rtc_interpreter" : { },
- "chart_visualizer" : { }
+ "chart_visualizer" : { }
}
}
\ No newline at end of file
