Merge branch 'devel'

ciscoecosystem · Oct 20, 2020 · 854a453 · 854a453
2 parents 99cb7ba + aded69b
commit 854a453
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+ConsulExtension/Service/__pycache__/*
+ConsulExtension/UIAssets/app/Tree/node_modules/*
diff --git a/ConsulExtension/Service/apic_utils.py b/ConsulExtension/Service/apic_utils.py
@@ -33,7 +33,7 @@ def create_cert_session():
     Create user certificate and session.
     """
 
-    cert_user = 'CiscoHashiCorp_ConsulExtensionforACI'  # Name of Application, used for token generation
+    cert_user = 'Cisco_Consul'  # Name of Application, used for token generation
     # static generated upon install
     plugin_key_file = '/home/app/credentials/plugin.key'
     pol_uni = PolUni('')
@@ -85,7 +85,7 @@ def login(self):
         """
         user_cert, plugin_key = create_cert_session()
         app_token_payload = {"aaaAppToken": {
-            "attributes": {"appName": "CiscoHashiCorp_ConsulExtensionforACI"}}}
+            "attributes": {"appName": "Cisco_Consul"}}}
         data = json.dumps(app_token_payload)
         pay_load = "POST" + urls.LOGIN_URL_SUFFIX + data
         private_key = load_privatekey(FILETYPE_PEM, plugin_key)

diff --git a/ConsulExtension/UIAssets/app/Tree/src/client/public/tree.js b/ConsulExtension/UIAssets/app/Tree/src/client/public/tree.js
diff --git a/ConsulExtension/UIAssets/constants.js b/ConsulExtension/UIAssets/constants.js
@@ -1,13 +1,13 @@
 /*
-* for appcenter: ConsulExtensionforACI
+* for appcenter: Consul
 */
-export const APPID = "ConsulExtensionforACI"; // this resembles App name
+export const APPID = "Consul"; // this resembles App name
 
 /*
-* for appcenter: CiscoHashiCorp
+* for appcenter: Cisco
 * for normal: Cisco
 */
-export const VENDORNAME = "CiscoHashiCorp"; 
+export const VENDORNAME = "Cisco";
 export const PROFILE_NAME = "datacenterName";
 export const INTERVAL_API_CALL = 30000; // in milliseconds
 

diff --git a/ConsulExtension/UIAssets/public/app.js b/ConsulExtension/UIAssets/public/app.js
diff --git a/ConsulExtension/UIAssets/public/tree.js b/ConsulExtension/UIAssets/public/tree.js
diff --git a/ConsulExtension/app.json b/ConsulExtension/app.json
@@ -3,7 +3,7 @@
         "graphql.json":"GraphQL Json"
     },
     "apicversion":"3.2(1l)",
-    "appid":"ConsulExtensionforACI",
+    "appid":"Consul",
     "author":"Dipika Mansukhani, Mohit Agrawal, Nipun Brahmbhatt, Devarshi Shah, Cisco, HashiCorp",
     "category":[
         "Visibility and Monitoring",
@@ -18,13 +18,13 @@
     "iconfile":"hashicorp-consul.png",
     "insertionURL":"fv:infoTenant:center",
     "metaversion":"1.0",
-    "name":"Consul Extension for ACI",
+    "name":"Consul",
     "permissions":[
         "admin"
     ],
     "permissionslevel":"read",
     "shortdescr":"This application enables L4-L7 Service Visibility, Service Mesh based Network Middleware Automation, between HashiCorp Consul and Cisco ACI",
-    "vendor":"Cisco HashiCorp",
-    "vendordomain":"CiscoHashiCorp",
+    "vendor":"Cisco",
+    "vendordomain":"Cisco",
     "version":"1.0"
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ConsulExtension/Service/__pycache__/*
		ConsulExtension/UIAssets/app/Tree/node_modules/*