Sfc-UI: Fixing SFF creation

+ adding missing select2 icons

Change-Id: Ieb9fd2e71462e981a48911809ca1dbe462dfce32
Signed-off-by: Andrej Kincel <[email protected]>

diff --git a/sfc-ui/src/main/resources/pages/src/app/sfc/sfc.services.js b/sfc-ui/src/main/resources/pages/src/app/sfc/sfc.services.js
index c2dd9f2b76bf08877d3b512316232202ca3e2306..5ebced49c1be705794dcd2cb642b62235b17d6b3 100755 (executable)
--- a/sfc-ui/src/main/resources/pages/src/app/sfc/sfc.services.js
+++ b/sfc-ui/src/main/resources/pages/src/app/sfc/sfc.services.js
@@ -1009,6 +1009,8 @@ define(['app/sfc/sfc.module'], function (sfc) {
       var sfTypePrefix = "service-function-type:";
       var locatorMatcher = new RegExp("^service-locator:");
       var locatorPrefix = "service-locator:";
+      var sffMatcher = new RegExp("^sevice-function-forwarder:");
+      var sffPrefix = "service-function-forwarder:";
 
       if (!_.isEmpty(sff['sff-data-plane-locator'])) {
         _.each(sff['sff-data-plane-locator'], function (locator) {
@@ -1028,6 +1030,10 @@ define(['app/sfc/sfc.module'], function (sfc) {
             sf['type'] = sfTypePrefix + sf['type'];
           }
 
+          if (angular.isDefined(sf['failmode']) && sf['failmode'].search(sffMatcher) < 0) {
+            sf['failmode'] = sffPrefix + sf['failmode'];
+          }
+
           if (angular.isDefined(sf['sff-sf-data-plane-locator']) &&
             angular.isDefined(sf['sff-sf-data-plane-locator']['transport'] &&
             sf['sff-sf-data-plane-locator']['transport'].search(locatorMatcher) < 0)) {

diff --git a/sfc-ui/src/main/resources/pages/vendor/select2/select2-spinner.gif b/sfc-ui/src/main/resources/pages/vendor/select2/select2-spinner.gif
new file mode 100644 (file)
index 0000000..5b33f7e
Binary files /dev/null and b/sfc-ui/src/main/resources/pages/vendor/select2/select2-spinner.gif differ

diff --git a/sfc-ui/src/main/resources/pages/vendor/select2/select2.png b/sfc-ui/src/main/resources/pages/vendor/select2/select2.png
new file mode 100644 (file)
index 0000000..1d804ff
Binary files /dev/null and b/sfc-ui/src/main/resources/pages/vendor/select2/select2.png differ

diff --git a/sfc-ui/src/main/resources/pages/vendor/select2/select2x2.png b/sfc-ui/src/main/resources/pages/vendor/select2/select2x2.png
new file mode 100644 (file)
index 0000000..4bdd5c9
Binary files /dev/null and b/sfc-ui/src/main/resources/pages/vendor/select2/select2x2.png differ